Moved some things and updated grunt tasks