Add refactoring of imports from codehaus
Also ignore classes in codehaus branch