Changed API key; rearranged files