Re-Structure the project