Introduced issues in all implementation files, change order of sections a little bit.