Modified directory set up and made grunt hack a bit prettier