Do move all things on root not soruces to private folder
Some changes for WAS