Rename boilerplate files and classes
Group unit testing in folder