Fix: folder structure