Improve package organisation and setup script