project structure changed

to better follow naming conventions