Amended folder arrangement and Java part.