Fixed missing dependencies and package problem
Fixed bug
Fixed classname vs. filename problem
Fixed several missing imports/references