Re-structured file layout ready for pod spec