re-structured the project