combined source trees and build so it runs tests and commons isn't a jar no mo'