Rearenged some files, for better structure, and added desktop notification