Refactoring structure.#266

staudtMarius wants to merge 4 commits intodevie3-institute/simonaAPI:devfrom

ms/#265-refactoring-structureie3-institute/simonaAPI:ms/#265-refactoring-structureCopy head branch name to clipboard