Modulate files to to got correct packaging, several changes. Please view commit log to comprend changes