Split existing code into packages
Renamed old problem solution