Moved plugins to their appropriate locations