Moving few more files to appropriate locations, as suggested by Tatsuo.