Switched to new project structure
Added monitor