Moved stuff around and added desktop files