Update folder structure and remove sub modules

[lupemba]

I make a separate PR to update the naming the rest will be too confusing