renamed and put the correct files in place

some cleanup + issue list as comments