separated js files; restructured object data