Added cluster capability and moved app to it's own file