Re-arranged file sturuct.