v0.2 refactoring to serverless-CLI version, not fully tested but need to commit and push