Added name functionality and folders