Refactoring, modified gitignore and added grunt