Move structure around and take out grunt

This fits the src/ and test/ setup I tend to use a bit better.