[Update] Correct folder organisation