Moving modifiers and filter related code to lower level files
Including an export command