Fixed stop condition for atom-bond overlap
Split up code in separate files