Continue to copy project from SafeBox with refactoring