Moved some files for best consistency