changed directory structure. v1.0