Restructured project and added Spring Boot