Move files around for better package structure