Cleaned up directories somewhat