General Structure Refactor & Added File Headings