moved everything to the top level to make deploying a lot easier