Fix for things being in the wrong file structure