Restructured app to use more modular js files