Further clean-up to the repo for better file structure and new code

Further clean-up to the repo for better file structure. It also includes our own code for starting to play with CMS data