Simplified directory structure for samples
Updated and simplified sample projects