Improved gitignore, cleaned up directory