class files moved to correct package