chore(cmdline): refactor directory layout to support cmdline options