new file organization
added a router. fixes #9