Second update - Sorted folder structure