Organize source tree more nicely