cleaned up migration without file deletion
removed some cruft
removed some cruft
removed some mystery js
reverted lots of deletions
merged in fixed directory structure branch