moved the counters and apicaller to lib for better organization