changed directory structure for convenience