Fixed code layout in order to properly bundle extension