Structured like a realy python project now