Moved everything to the right place I think
Moved things