Restructured the codeinsight package