Fix bugs
Arrange files in directories.