Moved all into a folder for Ubuntu packaging.