Updated structure

Back to old one - it's just way easier to work with.