changed project structure to be easier to understand