First drawft of new directory structure