Build/device dependencies

Move these so no more fatal duplicate project errors...