renaming, moving, better #docs