code restructure based on contest 30036043
Moved up tree structure since heroku deploys out of top level.
very minor updates from final fix round 3