Ehm... Basic obvious refactoring and git ignore changes