fixed compiler error
Handler/Project (and related) refactoring