Split up bootstrap files
Added common package