Refactor vundles into seperate file