Added application.extension
Organized a bit