Some slight changes to better understand what is happening around the code
Moving code to smarter package names. Going to try out Curator next