Moved stuff from Content folder in main dir to where it should be