reorganization into a real package (EOD checkpoint, doesn't compile)