Updated general structure

Also added basic JSON file for data storing