Composite pattern initial import/ package refactor