Started merging model-classes and app-classes