Adapting setup to directory structure