cleanup - still some hierarchical changes need to be made, but not enough time before uploading/troubleshooting