Updated Structure of Project