minor changes
re-arranged folder structure
updated Xcode after folder structure re-arranged