Refactor layout for classes

Base should be in it's own module, I think.