renamed a lot, implemented new functions
rename a few files