improv: make project structure simpler