cleanup, reorg routes
resolve conflict, initial tests
tests and reorgainzing routes
mergiong