diff --git a/.cz-config.js b/.cz-config.js
index ea4635aeb..b9c458ab3 100644
--- a/.cz-config.js
+++ b/.cz-config.js
@@ -28,7 +28,8 @@ module.exports = {
     {name: 'cerebral-router'},
     {name: 'function-tree'},
     {name: 'demos'},
-    {name: 'todomvc'}
+    {name: 'todomvc'},
+    {name: 'forms'}
   ],
 
   // it needs to match the value for field type. Eg.: 'fix'
diff --git a/packages/cerebral-forms/.gitignore b/packages/cerebral-forms/.gitignore
deleted file mode 100644
index 50d6a8290..000000000
--- a/packages/cerebral-forms/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-node_modules
-npm-debug.log
-coverage
-.nyc_output
-.DS_Store
-dist
-lib/*
-!/lib/package.json
diff --git a/packages/cerebral-forms/lib/package.json b/packages/cerebral-forms/lib/package.json
deleted file mode 100644
index fef12384d..000000000
--- a/packages/cerebral-forms/lib/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "cerebral-forms",
-  "version": "0.1.0",
-  "description": "Signals, actions and state factories to create forms",
-  "main": "index.js",
-  "author": "Christian Alfoni <christianalfoni@gmail.com>",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/cerebral/cerebral-forms.git"
-  },
-  "keywords": [
-    "cerebral",
-    "forms"
-  ],
-  "bugs": {
-    "url": "https://github.com/cerebral/cerebral-forms/issues"
-  },
-  "homepage": "https://github.com/cerebral/cerebral-forms#readme",
-  "peerDependencies": {
-    "cerebral": "^2.0.0-alpha.2"
-  }
-}
diff --git a/packages/cerebral-forms/package.json b/packages/cerebral-forms/package.json
index da95d3f5d..5856818a7 100644
--- a/packages/cerebral-forms/package.json
+++ b/packages/cerebral-forms/package.json
@@ -1,43 +1,38 @@
 {
   "name": "cerebral-forms",
+  "version": "1.0.0-alpha.1",
   "description": "Signals, actions and state factories to create forms",
+  "main": "lib/index.js",
   "scripts": {
-    "test": "mocha --compilers js:babel-register 'tests/**/*.js'",
+    "test": "../../node_modules/.bin/mocha --compilers js:../../node_modules/babel-register 'tests/**/*.js'",
     "test:watch": "npm run test -- --watch",
     "prebuild": "npm run test",
-    "build": "babel src/ --out-dir=lib/ -s",
-    "coverage": "nyc --reporter=lcov --reporter=text npm run test",
-    "lint": "standard"
+    "build": "BABEL_ENV=production ../../node_modules/.bin/babel src/ --out-dir=lib/ -s",
+    "coverage": "../../node_modules/.bin/nyc --reporter=lcov --reporter=text npm run test",
+    "prepublish": "npm run build"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/cerebral/cerebral-forms.git"
+    "url": "git+https://github.com/cerebral/cerebral.git"
   },
   "keywords": [
     "cerebral",
     "forms"
   ],
-  "author": "Christian Alfoni",
+  "author": "Christian Alfoni <christianalfoni@gmail.com>",
   "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/cerebral/cerebral-forms/issues"
+  "homepage": "https://github.com/cerebral/cerebral/tree/master/packages/cerebral-forms#readme",
+  "peerDependencies": {
+    "cerebral": "^2.0.0-alpha.4"
   },
-  "homepage": "https://github.com/cerebral/cerebral-forms#readme",
   "devDependencies": {
-    "assert": "^1.4.1",
-    "babel-cli": "^6.16.0",
-    "babel-core": "^6.17.0",
-    "babel-eslint": "^7.0.0",
-    "babel-preset-es2015": "^6.16.0",
-    "babel-preset-react": "^6.16.0",
-    "babel-register": "^6.16.3",
-    "cerebral": "^2.0.0-alpha.3",
-    "mocha": "^3.1.0",
-    "nyc": "^8.3.1",
-    "standard": "^8.3.0"
+    "cerebral": "^2.0.0-alpha.4"
   },
-  "standard": {
-    "parser": "babel-eslint"
-  },
-  "private": true
+  "nyc": {
+    "exclude": [
+      "node_modules",
+      "lib",
+      "tests"
+    ]
+  }
 }
diff --git a/packages/cerebral-forms/rollup.config.js b/packages/cerebral-forms/rollup.config.js
deleted file mode 100644
index c69b490f7..000000000
--- a/packages/cerebral-forms/rollup.config.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import babel from 'rollup-plugin-babel'
-import babelrc from 'babelrc-rollup'
-import multiEntry from 'rollup-plugin-multi-entry'
-
-let entry = `${process.env.entry}`
-let dest = `${process.env.dest}`
-
-export default {
-  entry: entry,
-  plugins: [
-    babel(babelrc()),
-    multiEntry()
-  ],
-  // external: external,
-  targets: [
-    {
-      dest: `dist/${dest}`,
-      format: 'cjs',
-      moduleName: 'rollupStarterProject',
-      sourceMap: true
-    },
-    {
-      dest: `dist/es/${dest}`,
-      format: 'es',
-      sourceMap: true
-    }
-  ]
-}
diff --git a/packages/cerebral-forms/tests/validate.js b/packages/cerebral-forms/tests/validate.js
index 5f2d0db71..782f8a015 100644
--- a/packages/cerebral-forms/tests/validate.js
+++ b/packages/cerebral-forms/tests/validate.js
@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 import {Controller} from 'cerebral'
-import {set} from 'cerebral/operators'
+import {set, state, input} from 'cerebral/operators'
 import {form, validateField, validateForm} from '../src'
 import assert from 'assert'
 
@@ -95,7 +95,7 @@ describe('validate', () => {
         },
         signals: {
           fieldChanged: [
-            set('state:form.name.value', 'input:value'),
+            set(state`form.name.value`, input`value`),
             validateField('form.name')
           ]
         }
@@ -120,7 +120,7 @@ describe('validate', () => {
         },
         signals: {
           fieldChanged: [
-            set('state:form.firstName.value', 'input:value'),
+            set(state`form.firstName.value`, input`value`),
             validateField('form.firstName')
           ]
         }
@@ -143,7 +143,7 @@ describe('validate', () => {
         },
         signals: {
           fieldChanged: [
-            set('state:form.name.value', 'input:value')
+            set(state`form.name.value`, input`value`)
           ],
           formSubmitted: [
             validateForm('form')