Refactored some classes.
Added filtering for routes and stops