Latest updates from UCL
Fixing conflict in awareEvent.js
Chaning Aware to run rather than date directory structures