Finished testing - this closes #4

Did the testing using components. Also changed around the directory a
bit.