changed architecture, started preparing for aurajs