new directory structure
merged wat