Restructured the folders to have a test folder so package-private
classes in the main folder can be tested.