more cleanup, proper renaming an removing not needed stuff