Clean up more code, get classes loading right