Minor changes to the rules. Re-organised directory structure.