Remove apache dir
Clean up and update .gitignore