Clean up the file structure a bit