Renamed and moved a lot of the files

Now they are in their proper directories