Did some cleaning, renamed impl classes