changed package structure to one with separate logical units