Issue #51 Updating the code structuring