Added new test implementations.
Re-arranged directory structure again.