Make package name more specific and removed buffer files