diff --git a/LICENSE b/LICENSE
index 85e3fcce2c0f8a3975a01f685e3bb60f9263b499..57f4239daf54e9d84a4762cf219428f626843602 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,12 +1,29 @@
-Copyright (c) 2012, The LAGO Project
+BSD 3-Clause License
+
+Copyright (c) 2012, The LAGO Collaboration
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 232d58a3e27f5421e4068ba5bd00b6cd47dc225e..018f42543f8c5b85f21e009757e3f7e038f6860c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,59 +1,54 @@
-#   Makefile   -- 
-#   Copyright (C) 2012-TODAY The LAGO Project, http://lagoproject.org, lago-pi@lagoproject.org
-#   Original authors: Hernán Asorey
-#   e-mail: asoreyh@cab.cnea.gov.ar  (asoreyh@gmail.com)
-#   Laboratorio de Detección de Partículas y Radiación (LabDPR)
-#   Centro Atómico Bariloche - San Carlos de Bariloche, Argentina 
-#
-# LICENSE BSD-3-Clause
-# Copyright (c) 2012, The LAGO Project
-# All rights reserved.
+################################################################################
+# File:        Makefile
+# Description: Builds the ANNA toolsuite, a scientific tool for analyzing 
+#              LAGO astrophysical data. Provides targets for building applications 
+#              (dump, example, raw, sol, ...) and cleaning build artifacts.
+# Author:      Hernán Asorey
+# Email:       asoreyh@gmail.com
+# Date:        2012-2023
 # 
-# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-
-#   -*- coding: utf8 -*-
-#   try to preserve encoding  
-CC = g++
+# Copyright:   [2012] [The LAGO Collaboration]
+# License:     BSD-3-Clause
+# See the LICENSE file in the project root for full license information.
+################################################################################
 
-TESTS = check-lago
-TARGETS = raw sol example dump
-CFLAGS = -Wall
+# Compiler and compile options
+CXX = g++
+CXXFLAGS = -Wall -Iinclude
 
-all: $(TESTS) $(TARGETS)
+# Source and build directories
+SRC_DIR = src
+BUILD_DIR = build
 
-raw: raw.cc lago_file.h lago_data.h
-	$(CC) -o $@ $< $(CFLAGS)
+# Tests
+TESTS = check-env
 
-grb: grb.cc lago_file.h lago_data.h
-	$(CC) -o $@ $< $(CFLAGS)
+# Applications
+APPS = dump example raw sol
 
-sol: sol.cc lago_file.h lago_data.h
-	$(CC) -o $@ $< $(CFLAGS)
+# Default target
+all: $(TESTS) $(APPS)
 
-example: example.cc lago_file.h lago_data.h
-	$(CC) -o $@ $< $(CFLAGS)
+# Compile each application
+$(APPS): %: $(BUILD_DIR)/%.o
+	$(CXX) $(CXXFLAGS) -o $@ $^
 
-dump: dump.cc lago_file.h lago_data.h
-	$(CC) -o $@ $< $(CFLAGS)
-
-.PHONY: clean
+# Rule for compiling object files
+$(BUILD_DIR)/%.o: $(SRC_DIR)/%.cc
+	@mkdir -p $(BUILD_DIR)
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
+# Clean up
 clean:
-	rm -f $(TARGETS)
+	rm -rf $(BUILD_DIR) $(APPS)
+
+.PHONY: all clean
 
-check-lago:
+check-env:
 ifndef LAGO_ANNA
-$(info LAGO_ANNA is not set.)
-$(info I will define it to $PWD, and modify the .bashrc)
+$(warning LAGO_ANNA is not set. I will define it to $(PWD), and modify the .bashrc)
 $(shell $(PWD)/lago-anna.sh)
 LAGO_ANNA=$(PWD)
-endif
+else
+$(info Environment variable LAGO_ANNA is set to $(LAGO_ANNA))
+endif
\ No newline at end of file
diff --git a/README.md b/README.md
index b7e32f5e12c5ec2a2b9ddb89f1c7b930005c610f..19ce5e88f05e639950700b4d0014bc3e8902e098 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,237 @@
-# ![The LAGO Project](http://lagoproject.net/images/lago-logo-90.png "The LAGO Project") The LAGO ANNA suite
-
-| CODENAME			| ANNA  |
-|-------------------|:------|
-| COPYRIGHT			| (C) 2012-Today, The LAGO Project, [lagoproject.net](http://lagoproject.net)|
-| LICENSE			| BSD-3-Clause |
-| REPOSITORY		| https://github.com/lagoproject |
-| CONTACT			| [lago@lagoproject.org](mailto:lago@lagoproject.org)|
-| DESCRIPTION		| The LAGO project operates its WCD by using different types of electronics, but using a unified data structure. Here you will find the latest stable (prod) version of the data analysis suite of the LAGO Project |
-| CONTRIBUTORS		| If you want to contribute to this project please [send us an email](mailto:lago@lagoproject.org)|
-
-
-| CODE GUIDELINES	|		|
-|-------------------|:------|
-| FILE ENCODING		| UTF8 (please use <kbd>iconv -f YOUR_ENCODING -t UTF-8 file_to_convert > converted_file </kbd> before to push) |
-| LANGUAGE			| English (preferred) |
-| INDENT STYLE		| [Stroustrup](http://en.wikipedia.org/wiki/Indent_style#Variant:_Stroustrup) using 1 tab for 4 columns wide. check [here for vim setup](http://tedlogan.com/techblog3.html) |
-|					| If you prefer, please use: <kbd>astyle -t4 -A4 -y file_to_convert</kbd> before to push
-| VERSIONING		| Sequence-based identifiers, v<version>r<release>. First public release: **v1r0**
-| INSTALL			| After installing dependences (see INSTALL), just *make*
-| USAGE				| Please visit our [wikipage](http://wiki.lagoproject.org) (internal use only)|
-
-The [Latin American Giant Observatory (LAGO)](http://lagoproject.org) is an extended Astroparticle Observatory at global scale. It is mainly oriented to basic research on three branches of Astroparticle physics: the Extreme Universe, Space Weather phenomena, and Atmospheric Radiation at ground level.
+<!-- [![DOI](https://zenodo.org/badge/28657065.svg)](https://zenodo.org/badge/latestdoi/28657065) -->
+<div id="top"></div>
+<br />
+<div align="center">
+  <a href="https://github.com/lagoproject/anna">
+    <img src="docs/images/lago-logo.png" alt="Logo" width="140">
+  </a>
+  <h3 align="center">The ANNA Framework</h3>
+  <p align="center">
+    A framework designed to analyze the data measured by the single Water Cherenkov Detectors (WCD) of the <a href="https://lagoproject.net/">LAGO</a> detection network. It follows the LAGO hierarchycal structured for the measured data.
+    <br />
+    <!-- <a href="https://github.com/lagoproject/anna"><strong>Explore the docs (soon) »</strong></a>
+    <br /> -->
+    <br />
+    <a href="https://github.com/lagoproject/anna/issues">Request Feature</a>
+    ·
+    <a href="https://github.com/lagoproject/anna/issues">Report Bug</a>
+    ·
+    <a href="#Contact">Contact us</a>
+</p>
+</div>
+
+<!-- TABLE OF CONTENTS -->
+<details>
+  <summary>Table of Contents</summary>
+<br />
+  <ol>
+    <li><a href="#about-anna">About ANNA</a></li>
+    <li><a href="#getting-started">Getting Started</a></li>
+    <li><a href="#usage">Usage</a></li>
+    <li><a href="#proposed-features">Proposed Features</a></li>
+    <li><a href="#contributing">Contributing</a></li>
+    <li><a href="#license">License</a></li>
+    <li><a href="#contact">Contact</a></li>
+  </ol>
+</details>
+
+<!-- ABOUT THE PROJECT -->
+## About ANNA
+<!--
+<style>
+html, body {height: 100%;}
+img {
+height: auto;
+width: auto;
+}
+img.rel {
+  width: 33%;
+}
+</style>
+-->
+
+<!-- <img class="rel" src="./docs/images/flux-chacaltaya.png" alt="The seconday particle flux at Chacaltaya" width="200"><img class="rel" src="./docs/images/geomagnetic.png" alt="Charged particles trajectories" width="200"><img class="rel" src="./docs/images/wcd-muon.png" alt="A muon traversing the WCD " width="200">
+-->
+
+ANNA is a complete framework designed to analyse the data the signals produced by the secondary particles emerging from the interaction of singles, multiple and even the complete flux of primary cosmic rays with the atmosphere. These signals are measured for any particle detector located at a LAGO site.
+
+ANNA is structured using different applications files and some headers where the main data classes are defined.
+
+During its normal operation and the different maintenance modes of the <a href="https://lagoproject.net/">LAGO detection network</a>, LAGO produces datasets containing different types of data. All the LAGO datasets follow standardized schemes based on linked data as described in our <a href="https://lagoproject.github.io/DMP/">DMP</a>. 
+
+<div id="measured"></div>
+
+### Measured data (Ln)
+
+The measured data LAGO dataset corresponds to any type of data that was measured in a LAGO site, including measurements of any type of radiation, atmospheric conditions, geomagnetic, solar irradiation, telemetry, and any other type of measurement produced by the LAGO detector and its peripherals. The LAGO measured data includes also any data product derived by any means of the previously described data. All the LAGO measured datasets are hierarchically tagged with the ***L<sub>n</sub>*** label, being ***n*** a sequential number, starting by *0*, that indicates the level of data processing: L<sub>0</sub> corresponds to the raw data, L<sub>1</sub> is the first level of analysed data, etc.
+
+### ANNA main reference and citation
+
+When using ANNA, please cite using the DOI included at the begininig of this file. 
+
+H. Asorey for the LAGO Collaboration, _"The LAGO ANNA Data Analysis framework"_, [doi:_SOON_](https://doi.org/).
+
+<p align="right">(<a href="#top">back to top</a>)</p>
+
+## LAGO ANNA versions 
+
+Currently, two electronic boards are consistenly used across the LAGO detection network. Two different versions were developed for [LAGO ACQUA](https://github.com/lagoproject/acqua), the LAGO data acquisition package. LAGO ANNA follows the same schema:
+
+* LAGO ANNA v1.x.x: Compatible with LAGO ACQUA v1, for the electronic board based on the NEXYS-II FPGA. Current version is the last developed version, [LAGO ACQUA v1.5.0](https://github.com/lagoproject/acqua/releases/tag/acqua-v1.5.0). In general, LAGO ANNA v1 are compatible with data acquired using LAGO ACQUA v1. 
+* LAGO ANNA v2.x.x: Compatible with LAGO ACQUA v2, designed for the electronic board based on the StemLab 125/14 RedPitaya electronic board. This is currently under actively development. 
+* LAGO ANNA v3.x.x: This will be developed for the new LAGO EDGE detection schema. 
+
+Major versions for both the LAGO ACQUA and the LAGO ANNA frameworks are developed in different branchs and identified with the corresponding tags. Master branch always points to the latest stable development. 
+
+
+<!-- GETTING STARTED -->
+## Getting Started
+
+To get a local copy of the ANNA framework up and running follow these simple example steps.
+
+### Prerequisites
+
+#### System requirements
+
+ANNA runs in any Linux based system, including those supported at iOS, raspberry-pis' and RedPitayas' linux-based OS. For Windows user, we strongly recommend to install some of your preferred linux distribution using virtualbox. 
+
+The command for installing required packages depends on the OS architecture. 
+
+In Fedora, Scientific Linux and CentOS, use 
+
+`sudo yum install <package>`. 
+
+In Ubuntu/Debian, including RPi and RPy SBC, use 
+
+`sudo apt install <package>`. 
+
+In both cases, you can also use the graphic package manager included in your preferred distro. 
+
+ANNA requires the installation of a few and largerly common standard packages: 
+
+* bash
+* gcc
+* make
+* screen
+* rsync
+* git 
+
+As a one-liner for Ubuntu/Debian:
+
+```bash 
+sudo apt install build-essential screen rsync git
+```
+(git is optional).
+
+#### Dependencies
+
+ANNA does not have any dependencies.
+
+### Installation
+
+1. If you are using git, just clone this repository:
+   ```bash
+   cd /path/to/ANNA/installation
+   git clone https://github.com/lagoproject/anna.git
+   ```
+   Otherwise, you can also directly download ANNA without using git (in this case, you should reinstall ANNA for every upgrade):
+   ```bash
+   cd /path/to/ANNA/installation
+   wget -c https://github.com/lagoproject/anna/archive/refs/heads/master.zip
+   unzip master.zip
+   rm master.zip
+   ```
+2. ANNA compiling is very simple:
+   ```bash
+   cd /path/to/ANNA/anna
+   make
+   ```
+   1. During the first installation of ANNA (or if you need to install ANNA in a different directory), `make` will define the `$LAGO_ANNA` environment variable, that points to the ANNA current directory installation. Then, ANNA installer will add the definition of this variable to the user's local `.bashrc` and to the local `$PATH` environment variable:
+   
+      ```bash
+      #
+      ## Changes added by the ANNA suite on <installation date>
+      #
+      export ANNA="/path/to/ANNA/installation/ANNA"
+      export LAGO_ANNA_VERSION="<LAGO ANNA current version>"
+      export PATH="${ANNA}:$PATH"
+      ```
+
+If you follow the above described steps and everything works well, you should find some new executable files at the root `${LAGO_ANNA}` directory.
+
+
+<p align="right">(<a href="#top">back to top</a>)</p>
+
+### ANNA updates, releases, branchs and tags
+
+ANNA is continously used, revised and updated within the [LAGO Collaboration](https://lagoproject.net). 
+
+Unless you are a developer, we recommend to use only the latest ANNA release contained in the `master` branch of this repository. Stable versions are tagged and can be found in the [corresponding section of this repository](https://github.com/lagoproject/anna/tags).
+
+Clone and install ANNA from `dev` or `dev-*` branches is strongly discouraged, as these branches are used for testing, bug correction and for the development of new features.
+
+If you are using `git`, you can update ANNA just by doing: 
+
+```bash
+cd /path/to/ANNA/anna
+git pull
+make
+```
+
+Otherwise, you could just reinstall ANNA by following the [installation guide](#installation).
+
+<p align="right">(<a href="#top">back to top</a>)</p>
+
+## Usage
+
+The ANNA framework follows the basic hierarchical structure of the <a href="#measured">LAGO Measured data</a>. It includes two basic applications, [`dump`](src/dump.cc) and [`example`](src/example.cc) intended as basic examples of the usage of the LAGO ANNA classes. 
+
+All the ANNA applications have their own integrated help, accesible through the `-?` modifier. 
+
+### General help and documentation
+
+The documentation is currently under preparation and will be released soon. A brief description of the action of each code and the available options and modifiers can be seen by calling them with the `-?` modifier.
+
+<!-- _For more examples, please refer to the [ANNA Documentation](docs)._ -->
+
+<p align="right">(<a href="#top">back to top</a>)</p>
+
+## Proposed features
+
+See the [open issues](https://github.com/lagoproject/anna/issues) for a full list of proposed features (and known issues).
+
+<p align="right">(<a href="#top">back to top</a>)</p>
+
+<!-- CONTRIBUTING -->
+## Contributing
+
+Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
+
+If you have a suggestion that would make this better, please fork the repo and create a pull request. You can also simply open an issue with the tag "enhancement".
+Don't forget to give the project a star! Thanks again!
+
+1. Fork the Project
+2. Create your Feature Branch (`git checkout -b feature/AmazingFeature`)
+3. Commit your Changes (`git commit -m 'Add some AmazingFeature'`)
+4. Push to the Branch (`git push origin feature/AmazingFeature`)
+5. Open a Pull Request
+
+<p align="right">(<a href="#top">back to top</a>)</p>
+
+<!-- LICENSE -->
+## License
+
+ANNA is distributed under the [BSD-3 License](https://opensource.org/licenses/BSD-3-Clause). See the [LICENCE](LICENSE) for more information.
+
+<p align="right">(<a href="#top">back to top</a>)</p>
+
+<!-- CONTACT -->
+## Contact
+
+The ANNA framework is developed by the LAGO Collaboration. If you need to contact us, please complete our [contact form](https://lagoproject.net/contact.html). 
+
+ANNA principal contact: [Dr Hernán Asorey (@asoreyh)](https://github.com/asoreyh)
+
+Project Link: [https://github.com/lagoproject/anna](https://github.com/lagoproject/anna)
+
+<p align="right">(<a href="#top">back to top</a>)</p>
\ No newline at end of file
diff --git a/docs/images/lago-logo.png b/docs/images/lago-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cd6151d6410c660b4515e6e28c23248a5da35b9
Binary files /dev/null and b/docs/images/lago-logo.png differ
diff --git a/dump.cc b/dump.cc
deleted file mode 100644
index 965167ede67a7a022e3c62a1ed46c05423b5be1f..0000000000000000000000000000000000000000
--- a/dump.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-/*  dump.cc  --  LAGO dump of pulses, mainly intended to debug and develop classes
- *  
- *  Copyright (C) 2016-TODAY The LAGO Project, http://lagoproject.org, lago-pi@lagoproject.org
- *
- *  Original authors: Hernán Asorey
- *  e-mail: asoreyh@cab.cnea.gov.ar  (asoreyh@gmail.com)
- *  Laboratorio Detección de Partículas y Radiación (LabDPR)
- *  Centro Atómico Bariloche - San Carlos de Bariloche, Argentina 
- */
-
-/* LICENSE BSD-3-Clause BSD-3-Clause
-Copyright (c) 2012, The LAGO Project
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*  -*- coding: utf8 -*-
- *  try to preserve encoding  */
-/************************************************************************/
-#define _FILE_OFFSET_BITS 64
-
-#include "lago_defs.h"
-#include "lago_data.h"
-#include "lago_file.h"
-
-using namespace std;
-
-#define MAXPULSEPERSEC 1000000
-
-// This is just an example to use LAGO libraries
-
-int main (int argc, char **argv) {
-	if (argc < 2) {
-		cerr << "Error: data file is needed. Please check." << endl;
-		cerr << endl;
-		cerr << "Usage: " << argv[0] << " <file>" << endl;
-		return 1;
-	}
-	LagoFile Input;
-	int NbPulses=0;
-	LagoGeneric Data;
-	LagoEvent *Pulse;
-	Pulse=(LagoEvent*)malloc(MAXPULSEPERSEC*sizeof(LagoEvent));
-	for (int i=0;i<MAXPULSEPERSEC;i++) 
-		Pulse[i].Init();
-	Input.Open(argv[1]);
-	Input.SetForce(1);
-  
-  //
-  // File reading and processing
-  //
-  double rt=0., ft=0., tt=0.;
-  cerr << "Reading file" << endl;
-  while(NbPulses!=-1) {
-    NbPulses=Input.ReadOneSecond(&Data,Pulse,MAXPULSEPERSEC);
-	for (int i=0; i<NbPulses; i++) {
-		rt = Pulse[i].GetRiseTime(2);
-		ft = Pulse[i].GetFallTime(2);
-		tt = Pulse[i].GetFullTime(2);
-		if (rt>0 && ft>0)
-			cout << rt << " " << ft << " " << tt << endl;
-	}
-  }
-  return 0;
-}
diff --git a/example.cc b/example.cc
deleted file mode 100644
index f8b872df559d467d91f698372958b5a37c3dc48e..0000000000000000000000000000000000000000
--- a/example.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  example.cc  --  LAGO example on how to include classes
- *  
- *  Copyright (C) 2012-TODAY The LAGO Project, http://lagoproject.org, lago-pi@lagoproject.org
- *
- *  Original authors: Hernán Asorey, Xavier Bertou
- *  e-mail: asoreyh@cab.cnea.gov.ar  (asoreyh@gmail.com)
- *  Laboratorio Detección de Partículas y Radiación (LabDPR)
- *  Centro Atómico Bariloche - San Carlos de Bariloche, Argentina 
- */
-
-/* LICENSE BSD-3-Clause BSD-3-Clause
-Copyright (c) 2012, The LAGO Project
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*  -*- coding: utf8 -*-
- *  try to preserve encoding  */
-/************************************************************************/
-#define _FILE_OFFSET_BITS 64
-
-#include "lago_defs.h"
-#include "lago_data.h"
-#include "lago_file.h"
-
-using namespace std;
-
-#define MAXPULSEPERSEC 1000000
-
-// This is just an example to use LAGO libraries
-
-int main (int argc, char **argv) {
-	if (argc < 2) {
-		cerr << "Error: data file is needed. Please check." << endl;
-		cerr << endl;
-		cerr << "Usage: " << argv[0] << " <file>" << endl;
-		return 1;
-	}
-	LagoFile Input;
-	int NbPulses=0;
-	LagoGeneric Data;
-	LagoEvent *Pulse;
-	Pulse=(LagoEvent*)malloc(MAXPULSEPERSEC*sizeof(LagoEvent));
-	for (int i=0;i<MAXPULSEPERSEC;i++) 
-		Pulse[i].Init();
-	Input.Open(argv[1]);
-  
-  //
-  // File reading and processing
-  //
-  cerr << "Reading file" << endl;
-  while(NbPulses!=-1) {
-    NbPulses=Input.ReadOneSecond(&Data,Pulse,MAXPULSEPERSEC);
-    cout << Data.second << " " << Data.pressure << " " << Data.temperature << " " << NbPulses << endl;
-	/* 
-	 * So, Data have one second of pulses, here we should our analysis
-	 * say, looking for excesses for grb analysis, something like this:
-	 * if (NbPulses>0)
-	 *		TreatSecond(&Data,Pulse,NbPulses);
-	 */
-  }
-  return 0;
-}
diff --git a/lago_data.h b/include/lago_data.h
similarity index 69%
rename from lago_data.h
rename to include/lago_data.h
index 8d3e806f38d4026c294ee7c5f545b404929a2703..fcb569fc863c59ad28aba595ff0246aea9890438 100644
--- a/lago_data.h
+++ b/include/lago_data.h
@@ -1,30 +1,16 @@
-/*  lago_data.h  --   Data analysis library for LAGO Data
- *
- *  Copyright (C) 2012-TODAY The LAGO Project, http://lagoproject.org, lago-pi@lagoproject.org
- *
- *  Original authors: Hernán Asorey, Xavier Bertou
- *  e-mail: asoreyh@cab.cnea.gov.ar  (asoreyh@gmail.com)
- *  Laboratorio de Detección de Partículas y Radiación (LabDPR)
- *  Centro Atómico Bariloche - San Carlos de Bariloche, Argentina */
-
-/* LICENSE BSD-3-Clause
-Copyright (c) 2012, The LAGO Project
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/*
+################################################################################
+# File:        lago_data.h
+# Description: Classes, methods and attributes for handling LAGO data defs.
+# Author:      Hernán Asorey
+# Email:       asoreyh@gmail.com
+# Date:        2012
+# 
+# Copyright:   [2012] [The LAGO Collaboration]
+# License:     BSD-3-Clause
+# See the LICENSE file in the project root for full license information.
+################################################################################
 */
-
-/*  -*- coding: utf8 -*-
- *  try to preserve encoding  */
-/****************************************************************************/
 #ifndef LAGO_DATA_H
 #define LAGO_DATA_H
 
diff --git a/include/lago_defs.h b/include/lago_defs.h
new file mode 100644
index 0000000000000000000000000000000000000000..fb69d7cf7a82425969c086cef53d159f655cdac5
--- /dev/null
+++ b/include/lago_defs.h
@@ -0,0 +1,31 @@
+/*
+################################################################################
+# File:        lago_data.h
+# Description: Global definitions for the LAGO ANNA framework
+# Author:      Hernán Asorey
+# Email:       asoreyh@gmail.com
+# Date:        2012
+# 
+# Copyright:   [2012] [The LAGO Collaboration]
+# License:     BSD-3-Clause
+# See the LICENSE file in the project root for full license information.
+################################################################################
+*/
+#ifndef LAGO_DEFS_H
+#define LAGO_DEFS_H 
+
+#define PROJECT "The LAGO ANNA Suite"
+#define CODENAME "ANNA"
+// DATAVERSION AND CODEVERSION SHOULD BE THE SAME NUMBER
+#define CODEVERSION "v5"
+#define DATAVERSION 5 
+
+#define CHANNELS 3
+#define TRACELEN 12
+#define BASELINE 50
+#define BIN 25.
+#define ADCMAX 1024
+#define CHRGMAX 4096
+#define TRIGGERBIN 3
+
+#endif
\ No newline at end of file
diff --git a/lago_file.h b/include/lago_file.h
similarity index 65%
rename from lago_file.h
rename to include/lago_file.h
index 1855636652e83a2a9d5bbc40e6a0c4ae1e5ae0ec..bf5764f8089880cba50ca231264f74a3b5bebe52 100644
--- a/lago_file.h
+++ b/include/lago_file.h
@@ -1,31 +1,16 @@
-/*  lago_file.h: handle different lago data structure files
- *
- *  Copyright (C) 2012-TODAY The LAGO Project, http://lagoproject.org, lago-pi@lagoproject.org
- *
- *  Original authors: Hernán Asorey, Xavier Bertou
- *  e-mail: asoreyh@cab.cnea.gov.ar  (asoreyh@gmail.com)
- *  Laboratorio de Detección de Partículas y Radiación (LabDPR)
- *  Centro Atómico Bariloche - San Carlos de Bariloche, Argentina */
-
-/* LICENSE BSD-3-Clause
-Copyright (c) 2012, The LAGO Project
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/*
+################################################################################
+# File:        lago_file.h
+# Description: handles different lago data structure files
+# Author:      Hernán Asorey
+# Email:       asoreyh@gmail.com
+# Date:        2012
+# 
+# Copyright:   [2012] [The LAGO Collaboration]
+# License:     BSD-3-Clause
+# See the LICENSE file in the project root for full license information.
+################################################################################
 */
-
-/*  -*- coding: utf8 -*-
- *  try to preserve encoding  */
-/************************************************************************/
-
 #ifndef LAGO_FILE_H
 #define LAGO_FILE_H
 
diff --git a/include/sol.h b/include/sol.h
new file mode 100644
index 0000000000000000000000000000000000000000..2bed7703980788c783f8e27201c6f8644a3d8105
--- /dev/null
+++ b/include/sol.h
@@ -0,0 +1,41 @@
+/*
+################################################################################
+# File:        sol.h
+# Description: header file for the 'sol' LAGO ANNA application
+# Author:      Hernán Asorey
+# Email:       asoreyh@gmail.com
+# Date:        2012
+# 
+# Copyright:   [2012] [The LAGO Collaboration]
+# License:     BSD-3-Clause
+# See the LICENSE file in the project root for full license information.
+################################################################################
+*/
+#define _FILE_OFFSET_BITS 64
+#include "lago_defs.h"
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <iostream>
+#include <fstream>
+#include <math.h>
+
+using namespace std;
+
+//global variables
+int irange=0, ipos=0, iband=0, ipeak=0, icompress=0, iflux = 0, iauto=1, iverbose=0;
+int check = 0;
+const int max_charge=4096;
+int avg_time = 10;
+double fluxtime=1.;
+double diameter = 0., height = 0.;
+int channel=0, start=0, width=0, qs=0, end_hst=max_charge, qe=max_charge;
+char type='0'; //charge
+int Open(char *nfi);
+inline double sign(double x);
+inline double log10(double x);
+double itpl_pos(double *pos_avg, double *chr_der, int i);
+double itpl_chr(double *pos_avg, double *chr_der, int i, double x);
+double fitHisto(int xi, int xf, double* h, double* r);
+void Usage(char *prog);
+FILE *fi, *out, *cal, *muo, *pof, *lof;
diff --git a/lago-anna.sh b/lago-anna.sh
index 8cd7ecfe25cd9165e2985eb26b54c909c4da67ca..13fd489a5f575eec947cad7147f6657932259ac7 100755
--- a/lago-anna.sh
+++ b/lago-anna.sh
@@ -1,35 +1,24 @@
 #!/bin/bash
-#   lago-anna.sh 
-#	define LAGO_ANNA and modify .bashrc
-#   Copyright (C) 2012-TODAY The LAGO Project, http://lagoproject.org, lago-pi@lagoproject.org
-#   Original authors: Hernán Asorey
-#   e-mail: asoreyh@cab.cnea.gov.ar  (asoreyh@gmail.com)
-#   Laboratorio de Detección de Partículas y Radiación (LabDPR)
-#   Centro Atómico Bariloche - San Carlos de Bariloche, Argentina 
-#
-# LICENSE BSD-3-Clause
-# Copyright (c) 2012, The LAGO Project
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+################################################################################
+# File:        lago-anna.sh
+# Description: Defines the environmental variables and modify the $USER .bashrc
+# Author:      Hernán Asorey
+# Email:       asoreyh@gmail.com
+# Date:        2012-2023
 # 
-
-#   -*- coding: utf8 -*-
-#   try to preserve encoding  
+# Copyright:   [2012] [The LAGO Collaboration]
+# License:     BSD-3-Clause
+# See the LICENSE file in the project root for full license information.
+################################################################################
+VERSION="1.5"
 export LAGO_ANNA=${PWD}
+export LAGO_ANNA_VERSION=${VERSION}
 date=$(date -u)
 echo "#
 ## Changes added by the LAGO ANNA suite on $date
 #
 export LAGO_ANNA=\"${LAGO_ANNA}\"
+export LAGO_ANNA_VERSION=\"${VERSION}\"
 export PATH=\"\${LAGO_ANNA}:\$PATH\"
 " >> ${HOME}/.bashrc
-source ${HOME}/.bashrc
+source ${HOME}/.bashrc
\ No newline at end of file
diff --git a/lago_defs.h b/lago_defs.h
deleted file mode 100644
index 60d7f42b5139674c948505d8a93f676acfd848a7..0000000000000000000000000000000000000000
--- a/lago_defs.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  lago_defs.h  --  LAGO definitions for this suite
- *
- *  Copyright (C) 2012-TODAY The LAGO Project, http://lagoproject.org, lago-pi@lagoproject.org
- *
- *  Original authors: Hernán Asorey
- *  e-mail: asoreyh@cab.cnea.gov.ar  (asoreyh@gmail.com)
- *  Laboratorio de Detección de Partículas y Radiación (LabDPR)
- *  Centro Atómico Bariloche - San Carlos de Bariloche, Argentina */
-
-/* LICENSE BSD-3-Clause
-Copyright (c) 2012, The LAGO Project
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*  -*- coding: utf8 -*-
- *  try to preserve encoding  */
-/************************************************************************/
-
-#ifndef LAGO_DEFS_H
-#define LAGO_DEFS_H 
-
-#define PROJECT "The LAGO ANNA Suite"
-#define CODENAME "ANNA"
-// DATAVERSION AND CODEVERSION SHOULD BE THE SAME NUMBER
-#define CODEVERSION "v5"
-#define DATAVERSION 5 
-
-#define CHANNELS 3
-#define TRACELEN 12
-#define BASELINE 50
-#define BIN 25.
-#define ADCMAX 1024
-#define CHRGMAX 4096
-#define TRIGGERBIN 3
-
-#endif
diff --git a/sol.h b/sol.h
deleted file mode 100644
index 3f89e53b724077b9d3589bfd7d311e2f8e1c7a56..0000000000000000000000000000000000000000
--- a/sol.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  sol.h  --  code oriented to perform Space Weather related analysis from 1-minute histograms
- *
- *  Copyright (C) 2012-TODAY The LAGO Project, http://lagoproject.org, lago-pi@lagoproject.org
- *
- *  Original authors: Hernán Asorey
- *  e-mail: asoreyh@cab.cnea.gov.ar  (asoreyh@gmail.com)
- *  Laboratorio de Detección de Partículas y Radiación (LabDPR)
- *  Centro Atómico Bariloche - San Carlos de Bariloche, Argentina */
-
-/* LICENSE BSD-3-Clause
-Copyright (c) 2012, The LAGO Project
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*  -*- coding: utf8 -*-
- *  try to preserve encoding  */
-/************************************************************************/
-#define _FILE_OFFSET_BITS 64
-#include "lago_defs.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <iostream>
-#include <fstream>
-#include <math.h>
-
-using namespace std;
-
-//global variables
-int irange=0, ipos=0, iband=0, ipeak=0, icompress=0, iflux = 0, iauto=1, iverbose=0;
-int check = 0;
-const int max_charge=4096;
-int avg_time = 10;
-double fluxtime=1.;
-double diameter = 0., height = 0.;
-int channel=0, start=0, width=0, qs=0, end_hst=max_charge, qe=max_charge;
-char type='0'; //charge
-int Open(char *nfi);
-inline double sign(double x);
-inline double log10(double x);
-double itpl_pos(double *pos_avg, double *chr_der, int i);
-double itpl_chr(double *pos_avg, double *chr_der, int i, double x);
-double fitHisto(int xi, int xf, double* h, double* r);
-void Usage(char *prog);
-FILE *fi, *out, *cal, *muo, *pof, *lof;
diff --git a/src/dump.cc b/src/dump.cc
new file mode 100644
index 0000000000000000000000000000000000000000..176610521ff1efc0e7014c63d3f11581bbbfeb2b
--- /dev/null
+++ b/src/dump.cc
@@ -0,0 +1,59 @@
+/*
+################################################################################
+# File:        dump.cc
+# Description: LAGO dump of pulses, mainly intended to debug and develop classes
+# Author:      Hernán Asorey
+# Email:       asoreyh@gmail.com
+# Date:        2012
+# 
+# Copyright:   [2012] [The LAGO Collaboration]
+# License:     BSD-3-Clause
+# See the LICENSE file in the project root for full license information.
+################################################################################
+*/
+#define _FILE_OFFSET_BITS 64
+
+#include "lago_defs.h"
+#include "lago_data.h"
+#include "lago_file.h"
+
+using namespace std;
+
+#define MAXPULSEPERSEC 1000000
+
+// This is just an example to use LAGO libraries
+
+int main (int argc, char **argv) {
+	if (argc < 2) {
+		cerr << "Error: data file is needed. Please check." << endl;
+		cerr << endl;
+		cerr << "Usage: " << argv[0] << " <file>" << endl;
+		return 1;
+	}
+	LagoFile Input;
+	int NbPulses=0;
+	LagoGeneric Data;
+	LagoEvent *Pulse;
+	Pulse=(LagoEvent*)malloc(MAXPULSEPERSEC*sizeof(LagoEvent));
+	for (int i=0;i<MAXPULSEPERSEC;i++) 
+		Pulse[i].Init();
+	Input.Open(argv[1]);
+	Input.SetForce(1);
+  
+  //
+  // File reading and processing
+  //
+  double rt=0., ft=0., tt=0.;
+  cerr << "Reading file" << endl;
+  while(NbPulses!=-1) {
+    NbPulses=Input.ReadOneSecond(&Data,Pulse,MAXPULSEPERSEC);
+	for (int i=0; i<NbPulses; i++) {
+		rt = Pulse[i].GetRiseTime(2);
+		ft = Pulse[i].GetFallTime(2);
+		tt = Pulse[i].GetFullTime(2);
+		if (rt>0 && ft>0)
+			cout << rt << " " << ft << " " << tt << endl;
+	}
+  }
+  return 0;
+}
\ No newline at end of file
diff --git a/src/example.cc b/src/example.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d0ba4e94583444bafba102d11e17dd01f952a316
--- /dev/null
+++ b/src/example.cc
@@ -0,0 +1,57 @@
+/*
+################################################################################
+# File:        example.cc
+# Description: LAGO example on how to include and use LAGO ANNA main classes
+# Author:      Hernán Asorey
+# Email:       asoreyh@gmail.com
+# Date:        2012
+# 
+# Copyright:   [2012] [The LAGO Collaboration]
+# License:     BSD-3-Clause
+# See the LICENSE file in the project root for full license information.
+################################################################################
+*/
+#define _FILE_OFFSET_BITS 64
+
+#include "lago_defs.h"
+#include "lago_data.h"
+#include "lago_file.h"
+
+using namespace std;
+
+#define MAXPULSEPERSEC 1000000
+
+// This is just an example to use LAGO libraries
+
+int main (int argc, char **argv) {
+	if (argc < 2) {
+		cerr << "Error: data file is needed. Please check." << endl;
+		cerr << endl;
+		cerr << "Usage: " << argv[0] << " <file>" << endl;
+		return 1;
+	}
+	LagoFile Input;
+	int NbPulses=0;
+	LagoGeneric Data;
+	LagoEvent *Pulse;
+	Pulse=(LagoEvent*)malloc(MAXPULSEPERSEC*sizeof(LagoEvent));
+	for (int i=0;i<MAXPULSEPERSEC;i++) 
+		Pulse[i].Init();
+	Input.Open(argv[1]);
+  
+  //
+  // File reading and processing
+  //
+  cerr << "Reading file" << endl;
+  while(NbPulses!=-1) {
+    NbPulses=Input.ReadOneSecond(&Data,Pulse,MAXPULSEPERSEC);
+    cout << Data.second << " " << Data.pressure << " " << Data.temperature << " " << NbPulses << endl;
+	/* 
+	 * So, Data have one second of pulses, here we should our analysis
+	 * say, looking for excesses for grb analysis, something like this:
+	 * if (NbPulses>0)
+	 *		TreatSecond(&Data,Pulse,NbPulses);
+	 */
+  }
+  return 0;
+}
\ No newline at end of file
diff --git a/raw.cc b/src/raw.cc
similarity index 92%
rename from raw.cc
rename to src/raw.cc
index 88d8c6178851bb58a53a88406425283c62c1048e..f43cb2003631cdaa1edc4289a66b04ea32d5ecdb 100644
--- a/raw.cc
+++ b/src/raw.cc
@@ -1,32 +1,17 @@
 /*
- * raw.cc  --  analyze "raw" (L0) data and produce the preprocessed "preliminary" (L1) data set.
- *
- *  Copyright (C) 2012-TODAY The LAGO Project, http://lagoproject.org, lago-pi@lagoproject.org
- *
- *  Original authors: Hernán Asorey, Xavier Bertou
- *  e-mail: asoreyh@cab.cnea.gov.ar  (asoreyh@gmail.com)
- *  Laboratorio de Detección de Partículas y Radiación (LabDPR)
- *  Centro Atómico Bariloche - San Carlos de Bariloche, Argentina
- */
-
-/* LICENSE BSD-3-Clause
-Copyright (c) 2012, The LAGO Project
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+################################################################################
+# File:        raw.cc
+# Description: Clean and analyze the L0 (raw) data measured at the LAGO WCD 
+# 			   detectors and produce the preprocessed L1 (preliminary) data set.
+# Author:      Hernán Asorey
+# Email:       asoreyh@gmail.com
+# Date:        2012
+# 
+# Copyright:   [2012] [The LAGO Collaboration]
+# License:     BSD-3-Clause
+# See the LICENSE file in the project root for full license information.
+################################################################################
 */
-
-/*  -*- coding: utf8 -*-
- *  try to preserve encoding  */
-/************************************************************************/
 #define _FILE_OFFSET_BITS 64
 
 #include <string.h>
@@ -424,13 +409,8 @@ void Usage(char *prog)
 {
 	cout << "\t" << PROJECT << " " << CODEVERSION << endl;
 	cout << endl;
-	cout << "\t(c) 2012-Today, The LAGO Project, http://lagoproject.org" << endl;
-	cout << "\t(c) 2012, LabDPR, http://labdpr.cab.cnea.gov.ar" << endl;
-	cout << endl;
-	cout << "\tThe LAGO Project, lago@lagoproject.org" << endl;
-	cout << endl;
-	cout << "\tDPR Lab. 2012" << endl;
-	cout << "\tX. Bertou and H. Asorey, asoreyh@cab.cnea.gov.ar" << endl;
+	cout << "\t(c) 2012, The LAGO Project, http://lagoproject.net" << endl;
+	cout << "\tH. Asorey, asoreyh@gmail.com" << endl;
 	cout << endl;
 	cout << "\tRaw data analysis suite for the LAGO Project (L0 -> L1)" << endl; 
 	cout << "Usage: " << prog << " [modifiers] <options> <values> <raw_file>[.dat[.bz2]]" << endl;
@@ -818,7 +798,7 @@ int main (int argc, char *argv[])
 
 	if (ical) {
 		cal << "# # # p 1 cal " << PROJECT << " " << CODEVERSION << endl;
-		cal << "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)" << endl;
+		cal << "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.net)" << endl;
 		cal << "# # This is a file containing the charge and peak calibration histograms" << endl;
 		cal << "# # Format is ch1 ch2 ch3 pk1 pk2 pk3" << endl;
 		if (imuo && imup)
@@ -838,7 +818,7 @@ int main (int argc, char *argv[])
 
 	if (itim) {
 		tim << "# # # p 1 tim " << PROJECT << " " << CODEVERSION << endl;
-		tim << "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)" << endl;
+		tim << "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.net)" << endl;
 		tim << "# # This is a file containing the time difference histogram" << endl;
 		tim << "# # Format is #time_difference(ns) #count for each channel" << endl;
 		if (tim_map)
@@ -853,13 +833,13 @@ int main (int argc, char *argv[])
 
 	if (iraw) {
 		raw << "# # # p 1 raw " << PROJECT << " " << CODEVERSION << endl;
-		raw << "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)" << endl;
+		raw << "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.net)" << endl;
 		raw << "# # This is a RAW file containing the first 10 seconds of data" << endl;
 	}
 
 	if (isol) {
 		fprintf(sol, "# # # p 1 sol %s %s\n", PROJECT, CODEVERSION);
-		fprintf(sol, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)\n");
+		fprintf(sol, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.net)\n");
 		fprintf(sol, "# # This is a Solar data file.\n");
 		fprintf(sol, "# # These are integrated charge and peak histograms, with monitoring information\n");
 		fprintf(sol, "# # Integrated time is %d seconds.\n", iSolTime);
@@ -877,7 +857,7 @@ int main (int argc, char *argv[])
 
 	if (iall) {
 		fprintf(all, "# # # p 1 all %s %s\n", PROJECT, CODEVERSION);
-		fprintf(all, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)\n");
+		fprintf(all, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.net)\n");
 		fprintf(all, "# # This is a file containing all processed data\n");
 		fprintf(all, "# # Format is # second frequency temperature pressure\n");
 		fprintf(all, "# #   time_to_prev_pulse counts_to_prev_pulse channels_triggered_mask ch_ch1 pk_ch1 ch_ch2 pk_ch2 ch_ch3 pk_ch3 risetime_ch1 falltime_ch1 risetime_ch2 falltime_ch2 risetime_ch3 falltime_ch3 (channel <i> is printed only if it triggered)\n");
@@ -892,14 +872,14 @@ int main (int argc, char *argv[])
 
 	if (imon) {
 		fprintf(mon, "# # # p 1 all %s %s\n", PROJECT, CODEVERSION);
-		fprintf(mon, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)\n");
+		fprintf(mon, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.net)\n");
 		fprintf(mon, "# # This is a monitoring file.\n");
 		fprintf(mon, "# # Format is second frequency temperature pressure average_baseline_chN dev_baseline_chN\n");  
 	}
 
 	if (iscl) {
 		fprintf(scl, "# # # p 1 scl %s %s\n", PROJECT, CODEVERSION);
-		fprintf(scl, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)\n");
+		fprintf(scl, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.net)\n");
 		fprintf(scl, "# # This is the old-lago-like scaler file.\n");
 		fprintf(scl, "# # Format is:\n");
 		fprintf(scl, "# # # s second frequency temperature pressure Total_Rate Rate_per_channel:_(%d)_columns\n",CHANNELS);
@@ -925,7 +905,7 @@ int main (int argc, char *argv[])
 	}
 	if (irte) {
 		fprintf(rte, "# # # p 1 rte %s %s\n", PROJECT, CODEVERSION);
-		fprintf(rte, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)\n");
+		fprintf(rte, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.net)\n");
 		fprintf(rte, "# # This is the rate (pulse per second) file.\n");
 		fprintf(rte, "# # Format is:\n");
 		fprintf(rte, "# # second temperature pressure Total_Rate Rate_per_channel:_(%d)_columns\n",CHANNELS);
@@ -938,7 +918,7 @@ int main (int argc, char *argv[])
 	}
 	if (iflx) {
 		fprintf(flx, "# # # p 1 flx %s %s\n", PROJECT, CODEVERSION);
-		fprintf(flx, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)\n");
+		fprintf(flx, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.net)\n");
 		fprintf(flx, "# # This is the flux file.\n");
 		fprintf(flx, "# # Format is:\n");
 		fprintf(flx, "# # second_at_half_interval avg_temp avg_press avg_rate avg_rate_per_channel sigma_temp sigma_press sigma_rate sigma_rate_per_channel\n");
@@ -1078,4 +1058,4 @@ int main (int argc, char *argv[])
 			fprintf(stderr, "\n");
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/sol.cc b/src/sol.cc
similarity index 89%
rename from sol.cc
rename to src/sol.cc
index 5b03f179bac29239779bc7c55c4f46f020b64352..54c3a287e7fe3251d28903d737e5c63c1aa9a213 100644
--- a/sol.cc
+++ b/src/sol.cc
@@ -1,30 +1,18 @@
-/*  sol.cc  -- code oriented to perform Space Weather related analysis from 1-minute histograms
- *
- *  Copyright (C) 2012-TODAY The LAGO Project, http://lagoproject.org, lago-pi@lagoproject.org
- *
- *  Original authors: Hernán Asorey
- *  e-mail: asoreyh@cab.cnea.gov.ar  (asoreyh@gmail.com)
- *  Laboratorio de Detección de Partículas y Radiación (LabDPR)
- *  Centro Atómico Bariloche - San Carlos de Bariloche, Argentina */
-
-/* LICENSE BSD-3-Clause
-Copyright (c) 2012, The LAGO Project
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/*
+################################################################################
+# File:        sol.cc
+# Description: Analyze L1 data for producing and analyzing 1-minute charge 
+# 			   (as part of the L2 (quality) data files), intented for be part of 
+#			   the high quality data release in the LAGO space weather program. 
+# Author:      Hernán Asorey
+# Email:       asoreyh@gmail.com
+# Date:        2012
+# 
+# Copyright:   [2012] [The LAGO Collaboration]
+# License:     BSD-3-Clause
+# See the LICENSE file in the project root for full license information.
+################################################################################
 */
-
-/*  -*- coding: utf8 -*-
- *  try to preserve encoding  */
-/************************************************************************/
 #include "sol.h"
 
 /* Functions */
@@ -103,13 +91,9 @@ void Usage(char *prog)
 {
 	cout << "\t" << PROJECT << " " << CODEVERSION << endl;
 	cout << endl;
-    cout << "\t(c) 2012-Today, The LAGO Project, http://lagoproject.org" << endl;
-    cout << "\t(c) 2012, LabDPR, http://labdpr.cab.cnea.gov.ar" << endl;
-    cout << endl;
-    cout << "\tThe LAGO Project, lago@lagoproject.org" << endl;
+    cout << "\t(c) 2012, The LAGO Project, http://lagoproject.net" << endl;
     cout << endl;
-    cout << "\tHalley (UIS) and ULA 2014" << endl;
-    cout << "\tY. Perez and H. Asorey, asoreyh@cab.cnea.gov.ar" << endl;
+    cout << "\tH. Asorey, asoreyh@gmail.com" << endl;
     cout << endl;
 	cout << "\tSpace Weather dedicated analysis (L1 -> L2SW)" << endl;
 	cout << "\tAnalyze .sol output files to identify solar modulation phenomena." << endl;
@@ -282,7 +266,7 @@ int main (int argc, char *argv[])
 		exit(1);
 	}
 	fprintf(lof, "# # # L2 log %s %s\n", PROJECT, CODEVERSION);
-	fprintf(lof, "# # L2 level file (lago@lagoproject.org): fit log for the sol automatic procedure\n");
+	fprintf(lof, "# # L2 level file (lago@lagoproject.net): fit log for the sol automatic procedure\n");
 	fprintf(lof, "## STATUS ## Analyzing %s\n", ifile);
 
 	/* preparing for work */
@@ -344,7 +328,7 @@ int main (int argc, char *argv[])
 
 	// headers
 	fprintf(out, "# # # L2 flx %s %s\n", PROJECT, CODEVERSION);
-	fprintf(out, "# # L2 level file (lago@lagoproject.org): flux of signals as function of time\n");
+	fprintf(out, "# # L2 level file (lago@lagoproject.net): flux of signals as function of time\n");
 	fprintf(out, "# # Analysis is done by integrating the whole channel %d charge histogram in\n", channel);
 	if (iband) {
 		fprintf(out, "# # %d bands of %d ADCq starting from %d ADCq and up to %d ADCq\n", nbands, width, start+1, end_hst+1);
@@ -364,7 +348,7 @@ int main (int argc, char *argv[])
 	}
 	if (iauto) {
 		fprintf(muo, "# # # L2 flx %s %s\n", PROJECT, CODEVERSION);
-		fprintf(muo, "# # L2 level file (lago@lagoproject.org): flux of signals as function of time\n");
+		fprintf(muo, "# # L2 level file (lago@lagoproject.net): flux of signals as function of time\n");
 		fprintf(muo, "# # Analysis is done by automaticaly detection of calibration histogram features\n");
 		fprintf(muo, "# # on channel %d, and integrating the flux in four different bands of deposited energy.\n", channel);
 		fprintf(muo, "# # Detector diameter=%.1f mm. Detector height=%.1f mm\n", diameter, height);
@@ -570,7 +554,7 @@ int main (int argc, char *argv[])
 				exit(1);
 			}
 			fprintf(pof, "# # # L2 pos %s %s\n", PROJECT, CODEVERSION);
-			fprintf(pof, "# # L2 level file (lago@lagoproject.org): file to check goodness of fit for automatic detection\n");
+			fprintf(pof, "# # L2 level file (lago@lagoproject.net): file to check goodness of fit for automatic detection\n");
 			fprintf(pof, "# # 4 columns format is:\n");
 			fprintf(pof, "# # Feature_Index Seed_for_fit Feature analyzed_file\n");
 		}