Better project structure
whoops