Removing observable.creation and splitting files