Removed unnecessary rule name from apply_to_all
Some code cleaning
Ordered directory structure.