small refactoring and reorganizing. blog mock

test pull request