Moved all class files into top level dir