Cli mode now works :) + clean App package