Upgrade to 0.6 and new project structure