Moved model entities to 'Model' folder