Added Costa and Ryan's work to report

Also cleaned up file structure