Removed EXTScope dependancy
Reorganized directory structure