Changing file structure to match tutorial more closely