Problem 5 optimised for speed + additional package reorganisation