new includes; rm ~ files; create cmds structure