Moved everything to Nancy project, working on unit tests now