Moved everything under new folder names that woudl be more expected.