Package reorganisation and logic tidied up/Indeed started to be integrated