Merge "divide resources into handlers and models"