Reorganization of the project.. A bit more standard folders.
(if there is some standard about it!. hah.)