re-arranging code, no functional change
Updating jucer project to include waf scripting