Small changes asked by the client. Libraries moved to code, to solve dependencies problems.