clean-up and project organisation