Changed project structure, and minor changes in model loading