Started moving class files to their own directory