issue#130 - reorganized directory tree