cleaned up files and moved tests into one folder.