Clean up files and file structure