Logical arrangement

Lots of moving around, wrapper classes, containers, making things more
readable etc