Shifted files around to accomodate Django
deleted some branches