Restructure files in directory, remove underscore from gitignore and other files