Reorganize files a bit, start switching over to JS