Moved some files for better naming convention. Added test for curl.