parsing functionality refactored, some renaming applied
data can be persisted now and read without internet connection