simplifyting directory structure