slight file re-structure