restructure, added GPL2