Clean code for packaging / shipping
Changing code to overcome 'locked file' problems.
Changes to overcome 'locked file' problems.