Rename or move around some files
Missed moving qbs criteria out
Start Implementing Retrieve functions