code rework started
source files renamed
cleanup