Basic refactoring and repackaging