removed cyclic dependencies
grunt builder + version that works with P