Organized Files
FIXED A BUG