Added imports and namespacing for individual files