0.6.11, contd, re-arrange folder structure, CompositeFilter in standalone file