#15 Package structure update