Chore: Reorganised JS stack