Updated file structure. Modified classifier initialization.