changed dir structure: cli, lib