Reorganized existing files into more logical packages. It is probably
far from perfect though. It's a start.