remove unrelated code, simplify directory