bugfixes #001, ##002, #003
restructured require
renamed views