rearranging some files
adjustments to ensure that code builds