Moved some stuff and updated files
Directives!
Restored *all* the functionality* merge complete!