moved files around for better symlinking