Formatted whole project with updated format

Added more entities