Break factories and services out + update index.html to reflect changes