Changed class files structure