fix breaking merge from 1.5.3
why did those even start with underscores
extract creating the default sources
clean up git_source code
fix merging reverted commit