#15
Move some classes back to the original package to minimize the impact on
other project