Moved 'filetypes' and 'services' packages under 'plugins'
Added missing unit test