renaming and moving files around for a better organization