Formatting, updated changelog to include work done here, cleaned up the file tree a bit.