Rename folders and re-organize project (required)