Reorganize, cleanup and update device.mk