Move main package to top level folder