Separate classes into Project and Portfolio files.  Also add new portfolio spec