Add ignore file
Cleanup some structures