Update file structure and clean up files