A bit of housecleaning

Just changed the package/class layout.