james | small refactorings
james | renamed directory