Moved things around, added new grunt tasks.