Moved some files, removed curl init code