Refactoring in progress, filters models & collections merged in 2 files only. 45% progress on dev.amd