Merge pull request #546 from NickyWeber/feature/#501_packages_step_one

Feature/#501 packages step one
Merge branch 'develop' into feature/#501_3_package_folder