Restructured code and fixed package repo. Quotes are not removed unless it's wrapping is on
small change