Cleaned up model folder