messed around with directory structure a bit