organization and path bug fixes