Generate correct file.
New asEvents method.
Move test class to test folder.
Tidy up.
Move application to app folder.