Refactorig the structs and project files
Removing unecessary files