Some rearrangment. Add regression scripts and data