Moved files around and fixed TWAA initialization