Updated Project Layout