This reverts commit a554c6f72c, reversing changes made to 2a0c9769aa.
a554c6f72c
2a0c9769aa
Much better organization of files into packages