Moved stuff + added better grunt support