More minor fixes
Removing public dir once again