Changed path structure and updated portolio.