Dev 20130330 rybka move handling files to handlers