Fixes
Initial commit of Editor, with new Module structure