source folder structure
Various changes