Reorganize source files
Split off -filter-islands command from -filter