cleaned up folder structure