changed files structure, fixed images wraping