Refactoring into EE Project