some refactoring
added handout project