Cleaned up directories and updated README