restructed files
added filter
something horrible going on