Moved some helper files around and finished the average filter.