Updated structure

-Actually moving directory items where they should be this time