re-organised to support activator as well as play framework