Updating code and file structure as per R. Strong