folder-ification and adding codekit