Added base dir structure