Restructure files to idiomatic Ruby style