Changes: Remove building-blocks
Changes: Rename bin file for CLI