Moved around files
Removed old folders
Updated context and plugins