Added spring actuator module + some code cleaning