Update to API lvl 20, fix build, reorganize project structure, update ReadMe