upgraded angular, moved some stuff