Move mapping initialization closer to the code that uses it
Remove the Demo namespace from the composer #98