Finaly, removed the gitkeep
Cleaned the code...