A more elegant project structure