Clean up packages and strucure settings