fixed #8
fixed #8
layout
fixed #11
removing obsolte files
fixed #9