Rearranged folders and removed .dea/ and vendor