update project:  add Controller and refactoring (and cleaning) project code.