Clean up file structure