Re-structured project
Will require a second commit for few tweaks that are required for fixing some issues.
Thoses few changes I mention in the previous commit.
Just a bit of namespace managment