Fixed folder-name and moved over missing files
cleanup
Should Fix #2