layout
fixed #11
removing obsolte files