Several changes

Changed the docs, file locations and added some stuf