Imported the old version and prepared for package separation