re-organises project and modifies test and gruntfile accordingly