Updated application structure. Added input / data modules for persistence amongs data input / passing throughout