Folder and package names fixed