Add 500 status to error in some cases
Update readme to reflect new folder structure