Reorganized for unit testing
Added missing angular modules