Improving structure (headers in src)