Moved files around

Prepare for future windows/linux support