restructure source folder