moved files into the right places and collectstatic