renamed folders for consistency with package