Re structured the project