Properly organizing the folders