Moving refactoring to separate branch.
Revert "refactoring - moving station stuff into station.py"

This reverts commit 28cff2ec15e791d44929ea7cffd63680906e56d2.