minor refactoring...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
split data into sections, and restructured the management, still a mess, still experimenting...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
lots of tweeks and minor fixes...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>