Fix services/intents
Fix location of extras directory