Move www folder into src. Support other changes