Restructured things and added web page stuff