Changed a few files and added all stuff to root folder