Moved files to models subdir