Moved directories

to try and make things easier to understand the layout.