REorganised a few things