Changed things to work with directory structure