Moved sources to other packages