Fixed counter class.
Fixed package naming.
Removed unwanted files.