Rewired some code in order to remove grid related directories.