incorporate helper methods and simplified routing
move combined files to own project