Some folder directory changes
cleared some option inheritance hierarchy