Changed the folder hierarchy.