moving and organizing some files to simplify the file structure.