Minimalized Code, Reorganized Bullet

Bullet Code needs fixing.