20140608 - file reorganization