Redo folder organization
Working