Re-Organized files, added missing components