Rename main files
Change JSON output structure for better usability

* JSON structure now better for MongoDB and general JSON usage