Separating Files, add Structure