File architecture change!