Consolidated js files, restructured files