Refactor the src tree yet again