Add filters and class structure

Merge morgan branch