Refactored project according to group decisions