Began adding unit tests. Re-arranged folder layout.