Moved files to try and fix bundling
Disabled bundling as it was breaking stuff