moved common files back to src root