more grunt work, also restructured the project slightly