Revert "- moving into packages"

This reverts commit adcafe86b200e4069e73b5ac334c3f81894dff03.