fixes #2411 - move files in /models to /concerns or /services