Refactoring to new structure.
Deleting old structure (no longer referenced)
fixing copyright headers.