Added more tests, restructured directories.