directory structure changed and minor updates