Moving Abstract class in the right place in code