Rename main src file
Remove the private methods shenanigans