Combine all of making site to one file;
Update handle directories; some fixes;