Add watch
Add minify task
Start tests reorganizing