More objcet oriented and renamed file