organized folders, updated with final code used spring 2013