Rearranges the files, adds random tests