Organised a little

Changed some files positions and created some folders.