Changed file structure. Added headers.