Moving things around ..
.
Adding license header.