Removed logs and renamed classes

This code will change to become simpler