Add sites; Modified file structure to have less files