Moved files around and commented code