Removed uneeded pub class
Fixing some paths