restructure folds and files to follow MVC conventions