removed unnecessary modules
parsing extracted to library