Split into header and main files