Re-arranged files. Switch from chosen to select2