Cleaned up directories and indentation.