mod_aspire: Lots of refactoring
mod_aspire: Major refactoring