Changed files structure and moved sobe logic to another ng module