File restructure, to better support have the views .html and .js files in the same place. 

Also changed "definition" to "controller" for views in the config, and removed the isTablet flag from the config and changed to use !has("phone") instead.