some restructurings and a more advanced editor style
updated changelog