Moved circle to its own class