More separation of the code
4 files changed