Restructured src folder and removed unneeded files (removed the samples-project folder (cause it's now a separate project)).
Merged from master.
Revert "Merged from master."

This reverts commit 654083fd6824eb97abe8afd29f06b1fb31800c42.