Unified structure

Test please.
if you think it's done, comment this and I will merge it :)