Simplified folder structure