Move evil org to main file, with changes