moved files into proper plugin folder
resolving merge conflict