Re-organize + Plugins Templates