Structure project, fix POC