ticket:73 restructurization