Initial set of changes. Looking pretty good.
Move index file