Final refactoring and QA for BETA2
Fixing PMD warnings
add nature - discovers existing controllers when you add the nature
shouldn't of been checked in
