changed directory structure to reflect ~/