Some reorg, some renaming, and some OOP. Working on the admin importer for the stations