Separate core and servlet bootstrap into several modules