Alteration to website candidate

Cleaning up the code structure and file names