Project restructuration + back-end added