Made changes to framework based on class feedback

Also moved contents of dev folder out and deleted it.