Updated code moved to public dir