Add some utily files and move code.