renaming, moving ans sharing of code - general tidy up