#9 Added base directory structure