Cli, FS refactoring, build system