Edgarfixes

Fixed the comments and rearranged the whole architecture of the package