Minor changes
Structured the project