Grunt

Cleaned up the file structure. Grunt is fully functional.