Cleaned up builder branch (removed references to the src)