Closes 2, Closes 1 -- added grunt support, slight structure changes, testing
Closes #3 -- restructure the /content