Some cleaning up
Refactored everything into one bundle