Cleaned up directory paths