Added prefix to main class files