<cleanup>
selfAssign

Moved file locations