Back to one-file-structure