Moving models from file to folder for clarity