Moving classes around and fixing import