Started work on better way to handle files and directories from the server