Another attempt to structure all my code