just some changes
copy headers to other files and remove unused/temp files