added rectangles and reformatted directory structure