Fixed dependency issue and added public dir