Updated EBM folder structure