Changes in src/

It's placed in 5 commits.