removed class files, final
merge