Added relation objecj + package refactorization + test refactorization