Added independant class files and relationships