Moved and renamed some files. Bit of re-organizing and what not.
Started the testing file.