moved class files to /lib