Rearranged files, added videos
Added files to /files/* videos
Merged database finally. About to switch from .net to .ca