Modifying web project structure to follow modular format.  Tests are not yet updated