Moving around files. Added some functions and some simple tests.