finalized adding main classes

also added new folder for cardlists. seemed more logical.