Re-arranged crazy folder structure