Massive refactor of Moving and Loading to abstract from data. Both done