Reorganize, fix bug in code
Build Site