Added Placement Properties and reordered file structure