rename to *.rb and code-cleanup