Tweaks to make the src/minecraft dir cleaner and proper cleanup