new files and some refacotring