Refractoring file structure during class