Moved location of files to don´t mix models with actual services
Changed GruntConfig to also watch changes in the test-site