Dir-layout according to what I planned