Cross system optimization

Moving towards using DIRECTORY_SEPERATOR instead of '/'