fixed some checkstyle bugs and reorganized directory structure