commit major update

Renamed project and directories more appropriately, fixed watch task,
added modules content dependencies.