Reorganized folder structure to match the one on Server Sunrise