adjust source file and README.md structure