Moved some files and restored old version to get stuff working again