cleaned up grunt, working on moving some files around