Edit code and rename files to prepare for .deb packaging