Added testweb project, refactored structure