refactor cli, server and watcher
fix bug with custom source folders