directory structure cleaned up