Re-arranged project structure slightly.