Folder structure changes, making it more simple