Signature class added, new folder structure