Second commit
Lightly changes in structures