Testing merged - modularized the application

Switched to using a config.ru + lots of small sinatra apps to ensure separation.