reorganized directories and setup runs