[BP] Tidying up messy code
[BP] Organising Rules into smaller context specific chunks
[BP] Organising Rules into smaller context specific chunks