Fixed the folders correctly