Moved some stuff around, no more proprietary

Change-Id: I6927e33250d3d66a261a8aa597ee57e82bb3b06c