Revert "Make file adjustments and new stage"

This reverts commit 2acdc3d4b7815b69e9fda4bb47a2dd6c737e2a85.