added some tests, updated gulp, added watch, re-orged project file structure