General refactor, include requirements file