Moved entities into separate files
Added code to delete indexes at beginning of exec