updated project structure a bit