Please pull the reformatted directory structure, and some cleanup