changed folder structure in utils project