Organize a bit and check for good build