Revert "organizandome"

This reverts commit 8a826a3a5b28e74c5730520b7e14e5689516615f.