Use WakeLocker, reorganize