cleanded up directory structure