#5 - Refactoring over dao, service and faces packages.