Added MainBundle and UserBundle