Fixed building of models, moved code into directory structure.