Refactoring code so that directories match package names.