moved config files to single directory and fixed grunt build file
moved configuration to single object and fixed tests