moves some files around, breaks out model controller and service