latest commit, overlay, replace working and refactored code into relevant packages.