modified and cleaned up the directory structure