Fixed poor structure and added better copyright functionality