Refactored packages. Added data visualisation.