Fixing and Structurize application