clean up retired directories and some file name updates
base build clean ups