Remove our autoloader and load all classes explicitly (there's only four anyway). See #7
Rearrange a bit of logic