Organized files, added some test cases