Rename source classes for consistency
Add string source (fixes #17)