Refactored Pocket app and created CommonServices project