moved everything into the UserBundle directory