Reverting to original string formatting
Renaming tosActivity.java to TosActivity.java
Whitespace formatting changes to match upstream