Cleanup on asile 9

Cleanup of files and minor file location change