Restructured post_install