merged work, removed unecessary files