Changed from static to instance
Moved bin files