Moves and rename refortoring of files were made.
ik