Updated File Structure & Gruntfile