Fix paths and remove models and stores

Fix calls to getController so they use new ma folder and remove models
and stores no longer used