Refactor: Moving files around and beginning clear tests