Removed uneeded folder
Some path fixes