Cleans up file structure a bit