Project restructuring, refined code