CodeMaid code reorganization.