Cleaned up the activities and moved the BeaconService into own package.