Updated model folder structure