Working on redoing some of this mess. Created a structure in the secint2 folder