Resctructured, added some more files