changing directory structure
removed old directory stuff