CLEAN: refactor organization