code reorganization

[Fur4nk]

This is a great example of spaghetti's code at the moment. Full reorganization is needed:

• Internal class should be re thinked and in case improved.
• Folder structure is needed