Removed redundant folder+class