Bugfix/directory fixes