Atc restructure folder code

should not affect gh-book but depends on #92 and probably #53