Src change

More folder structure changes.