Added Triangle to lib, moved room to its own file