Setup a better module system
Moved modules  into a more simple folder structure