project update for refactored class files