cleaned up directory structure