Organized files, fixed a minor bug