checkstyle stuff
package restructure