added requirements
Moved things around a bit