Fix directory structure, revert to just having just default grunt task