Fixes .framework issue and adds initial scheme syntax
Initial multiple scheme support
Tweaks to scheme naming