Updated license headers
Moved files around