New structure
Remove files
Resolve conflicts
Merge pull request #4 from scubbasteve302/steven

Clean