moved tests to test folder, updated javadoc