adding in marrow and grunt and sorting some things out with file structure