Rework directory structure