Created CoreBundle and moved some stuff