Trying to restructure sources to make it more gclient-friendly