Did some cleaning, renamed all impl classes