refactor a  bit of the project structure