Minor styling, route renames, folder reorg