Moved files into impl structure
Added comments to test