Removed unnecessary folder nesting