Refactoring of the datastructure

This release provides the same feature with a more maintainable data structure

first_running_release

Still needs a lot of refactoring