Wakelock implemented, Code structure reorganized