Renaimed+moved folders in more appropriate structure