Reorganized source to make more compatible with debuild process