Moved classes from one generic package to more specific ones.
Fixed phase listener class name.
Removed commented code.
Format comments.