Cleaned up the structure and streamlined development time grunt file.