Changes in structure, added licence header
Merge commit 'd418cf7c8097d6be2460598b34d67dd404f8b553' into develop