Organized all programs into correct packages