cleared up folder structure