Renamed files, added base data getter
Updated stuff