cont
first dir structure
manual merge