moved model layer into main layer