renaming and moving
more cleanups and additions
perltidy