Added grunt and restructure