updated main class files