prepare for directory restructure
29 files changed