Code cleaning, changed package organization, new model classes