Made some additions and changes to the filters and code structure
Structure reformation