some more restructuring
Merge pull request #9 from BusTicker/load_data

some more restructuring