[FIX] Actually fix files being in wrong place