Got rid of .gitkeep files
Checkstyle fixes