Moved a whole stack of stuff around to match psr-4 and basically make the package nicer to work with.