Removed all underbars and added getters and setters as needed
Changed main folder to src/