Feature/refactor relation

/to @ritch 
What is the purpose of the two classes if one just dcalls the other?