fix the moving
fix naming from import
fix imports in main package