Moved phase objects to specific subpackages