#11 Reorganisation of packages