* Little restructuring: split-up application into smaller modules by responsibility