Make some cleanup and move to pkg from default