Add gitignore and fix directory structure