Restructuing, preping for iss/bug/enhanc