move all the sheit to own dir
remove calls to rawget/rawset