Add FilePathBuilder
Move classes to lib