Project and Repository Refactorization. Fix imports and tests