Removed redundant folder + various small fixes