Move model classes to the correct folder and update dependencies