Moved files around and including JS files