diff --git a/achado-perdido/.gitignore b/achado-perdido/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/achado-perdido/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/achado-perdido/.mvn/wrapper/maven-wrapper.jar b/achado-perdido/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..c1dd12f
Binary files /dev/null and b/achado-perdido/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/achado-perdido/.mvn/wrapper/maven-wrapper.properties b/achado-perdido/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..b7cb93e
--- /dev/null
+++ b/achado-perdido/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
diff --git a/achado-perdido/mvnw b/achado-perdido/mvnw
new file mode 100755
index 0000000..8a8fb22
--- /dev/null
+++ b/achado-perdido/mvnw
@@ -0,0 +1,316 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`\\unset -f command; \\command -v java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/achado-perdido/mvnw.cmd b/achado-perdido/mvnw.cmd
new file mode 100644
index 0000000..1d8ab01
--- /dev/null
+++ b/achado-perdido/mvnw.cmd
@@ -0,0 +1,188 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%
diff --git a/achado-perdido/pom.xml b/achado-perdido/pom.xml
new file mode 100644
index 0000000..1f10772
--- /dev/null
+++ b/achado-perdido/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.3.1.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>br.com.accurate</groupId>
+    <artifactId>achado-perdido</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>achado-perdido</name>
+    <description>Demo project for Spring Boot</description>
+    <properties>
+        <java.version>11</java.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/AchadoPerdidoApplication.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/AchadoPerdidoApplication.java
new file mode 100644
index 0000000..9e7057f
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/AchadoPerdidoApplication.java
@@ -0,0 +1,13 @@
+package br.com.accurate.achadoperdido;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class AchadoPerdidoApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AchadoPerdidoApplication.class, args);
+    }
+
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/config/dto/ErroDTO.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/config/dto/ErroDTO.java
new file mode 100644
index 0000000..7592370
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/config/dto/ErroDTO.java
@@ -0,0 +1,13 @@
+package br.com.accurate.achadoperdido.config.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ErroDTO {
+
+    private String mensagem;
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/config/dto/InputValidationDTO.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/config/dto/InputValidationDTO.java
new file mode 100644
index 0000000..282712b
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/config/dto/InputValidationDTO.java
@@ -0,0 +1,13 @@
+package br.com.accurate.achadoperdido.config.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class InputValidationDTO {
+    private String campo;
+    private String erro;
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/config/exceptionsHandler/InputValidationsHandler.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/config/exceptionsHandler/InputValidationsHandler.java
new file mode 100644
index 0000000..4875fb3
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/config/exceptionsHandler/InputValidationsHandler.java
@@ -0,0 +1,48 @@
+package br.com.accurate.achadoperdido.config.exceptionsHandler;
+
+import br.com.accurate.achadoperdido.config.dto.InputValidationDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestControllerAdvice
+public class InputValidationsHandler {
+
+    @Autowired
+    MessageSource messageSource;
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public List<InputValidationDTO> handleInvalidArgument(MethodArgumentNotValidException erro) {
+        List<InputValidationDTO> dtoErrors = new ArrayList<>();
+
+        List<FieldError> fieldErrors = erro.getBindingResult().getFieldErrors();
+
+        fieldErrors.forEach(field -> {
+            String erroMessage = messageSource.getMessage(field, LocaleContextHolder.getLocale());
+            InputValidationDTO mensagem = new InputValidationDTO(field.getField(), erroMessage);
+
+            dtoErrors.add(mensagem);
+        });
+
+        return dtoErrors;
+    }
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(MissingServletRequestParameterException.class)
+    public InputValidationDTO handleMissingParameter(MissingServletRequestParameterException erro) {
+
+        return new InputValidationDTO(erro.getParameterName(), "O Parâmetro: '" + erro.getParameterName() + "' não pode estar vazio");
+    }
+
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/config/exceptionsHandler/RecursoNaoEncontradoHandler.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/config/exceptionsHandler/RecursoNaoEncontradoHandler.java
new file mode 100644
index 0000000..915a823
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/config/exceptionsHandler/RecursoNaoEncontradoHandler.java
@@ -0,0 +1,18 @@
+package br.com.accurate.achadoperdido.config.exceptionsHandler;
+
+import br.com.accurate.achadoperdido.config.dto.ErroDTO;
+import br.com.accurate.achadoperdido.exceptions.RecursoNaoEncontradoException;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@RestControllerAdvice
+public class RecursoNaoEncontradoHandler {
+
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    @ExceptionHandler(RecursoNaoEncontradoException.class)
+    public ErroDTO handle(RecursoNaoEncontradoException erro) {
+        return new ErroDTO(erro.getMessage());
+    }
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/CategoriaController.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/CategoriaController.java
new file mode 100644
index 0000000..15fdb7f
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/CategoriaController.java
@@ -0,0 +1,33 @@
+package br.com.accurate.achadoperdido.controllers;
+
+import br.com.accurate.achadoperdido.controllers.forms.CategoriaForm;
+import br.com.accurate.achadoperdido.modelo.Categoria;
+import br.com.accurate.achadoperdido.services.CategoriaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/v1/categorias")
+public class CategoriaController {
+
+    @Autowired
+    private CategoriaService categoriaService;
+
+    @GetMapping
+    public ResponseEntity index() {
+        List<Categoria> categorias = this.categoriaService.listarTodas();
+
+        return ResponseEntity.ok().body(categorias);
+    }
+
+    @PostMapping
+    public ResponseEntity salvar(@RequestBody @Valid CategoriaForm categoriaForm) {
+        Categoria categoria = categoriaForm.converter();
+        return ResponseEntity.ok(this.categoriaService.cadastrar(categoria));
+       
+    }
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/ItemController.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/ItemController.java
new file mode 100644
index 0000000..cb87f62
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/ItemController.java
@@ -0,0 +1,88 @@
+package br.com.accurate.achadoperdido.controllers;
+
+import br.com.accurate.achadoperdido.controllers.dto.ItemDTO;
+import br.com.accurate.achadoperdido.controllers.forms.AtualizaItemForm;
+import br.com.accurate.achadoperdido.controllers.forms.ItemForm;
+import br.com.accurate.achadoperdido.modelo.Item;
+import br.com.accurate.achadoperdido.repository.CategoriaRepository;
+import br.com.accurate.achadoperdido.services.ItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/api/v1/itens")
+public class ItemController {
+
+    @Autowired
+    private CategoriaRepository categoriaRepository;
+
+    @Autowired
+    private ItemService itemService;
+
+    @GetMapping
+    public ResponseEntity<Page<ItemDTO>> index(@RequestParam(required = false) Long categoria_id, Pageable paginacao) {
+
+        Page<Item> itens;
+        if (categoria_id != null) {
+            itens = this.itemService.listarTodos(paginacao);
+        } else {
+            itens = this.itemService.listarPorCategoria(categoria_id, paginacao);
+        }
+        Page<ItemDTO> itensDTO = itens.map(ItemDTO::new);
+
+        return ResponseEntity.ok(itensDTO);
+    }
+
+    @GetMapping("/procurar")
+    public ResponseEntity<Page<ItemDTO>> procurar(@RequestParam Long categoria_id,
+                                                  @RequestParam Double raio,
+                                                  @RequestParam Double latitude,
+                                                  @RequestParam Double longitude, Pageable paginacao) {
+
+
+        Page<Item> itens = this.itemService.obterItemPorLocalidadeCategoriaERaio(categoria_id, raio, latitude, longitude, paginacao);
+
+        Page<ItemDTO> itensDTO = itens.map(ItemDTO::new);
+
+        return ResponseEntity.ok(itensDTO);
+    }
+
+    @GetMapping("/{id}")
+    public ResponseEntity<ItemDTO> detalhes(@PathVariable Long id) {
+        Item item = itemService.buscarPorId(id);
+
+        return ResponseEntity.ok(new ItemDTO(item));
+    }
+
+    @PostMapping
+    public ResponseEntity<ItemDTO> salvar(@RequestBody @Valid ItemForm itemForm) {
+        Item item = itemForm.converter(categoriaRepository);
+
+        return ResponseEntity.ok(new ItemDTO(this.itemService.cadastrar(item)));
+    }
+
+    @PutMapping("/{id}")
+    public ResponseEntity<ItemDTO> atualizar(@PathVariable Long id, @RequestBody AtualizaItemForm itemForm) {
+
+        Item item = itemForm.atualizar(this.categoriaRepository, this.itemService.buscarPorId(id));
+
+        this.itemService.atualizar(id, item);
+
+        return ResponseEntity.ok(new ItemDTO(item));
+
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<?> deletar(@PathVariable Long id) {
+        this.itemService.apagar(id);
+
+        return ResponseEntity.ok().build();
+    }
+
+
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/dto/ItemDTO.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/dto/ItemDTO.java
new file mode 100644
index 0000000..4fa1b5a
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/dto/ItemDTO.java
@@ -0,0 +1,28 @@
+package br.com.accurate.achadoperdido.controllers.dto;
+
+import br.com.accurate.achadoperdido.modelo.Categoria;
+import br.com.accurate.achadoperdido.modelo.Item;
+import br.com.accurate.achadoperdido.modelo.Situacao;
+import lombok.Getter;
+
+@Getter
+public class ItemDTO {
+    
+    private Long id;
+    private String nome;
+    private String descricao;
+    private LocalDTO local;
+    private Categoria categoria;
+    private Situacao situacao;
+
+    public ItemDTO(Item item) {
+        this.local = new LocalDTO(item.getLocal());
+        this.nome = item.getNome();
+        this.descricao = item.getDescricao();
+        this.categoria = item.getCategoria();
+        this.situacao = item.getSituacao();
+        this.id = item.getId();
+
+    }
+
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/dto/LocalDTO.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/dto/LocalDTO.java
new file mode 100644
index 0000000..b6daabb
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/dto/LocalDTO.java
@@ -0,0 +1,15 @@
+package br.com.accurate.achadoperdido.controllers.dto;
+
+import br.com.accurate.achadoperdido.modelo.Local;
+import lombok.Getter;
+
+@Getter
+public class LocalDTO {
+    private Double latitude;
+    private Double longitude;
+
+    public LocalDTO(Local local) {
+        this.latitude = local.getLatitude();
+        this.longitude = local.getLongitude();
+    }
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/forms/AtualizaItemForm.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/forms/AtualizaItemForm.java
new file mode 100644
index 0000000..3601fa1
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/forms/AtualizaItemForm.java
@@ -0,0 +1,51 @@
+package br.com.accurate.achadoperdido.controllers.forms;
+
+import br.com.accurate.achadoperdido.modelo.Categoria;
+import br.com.accurate.achadoperdido.modelo.Item;
+import br.com.accurate.achadoperdido.modelo.Situacao;
+import br.com.accurate.achadoperdido.repository.CategoriaRepository;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Optional;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class AtualizaItemForm {
+    private String nome;
+    private String descricaoItem;
+    private Long categoria;
+    private Situacao situacao;
+
+    @Override
+    public String toString() {
+        return "AtualizaItemForm{" +
+                "nome='" + nome + '\'' +
+                ", descricaoItem='" + descricaoItem + '\'' +
+                ", categoria=" + categoria +
+                ", situacao=" + situacao +
+                '}';
+    }
+
+    public Item atualizar(CategoriaRepository categoriaRepository, Item item) {
+
+
+        if (this.categoria != null) {
+            Optional<Categoria> categoria = categoriaRepository.findById(this.categoria);
+            categoria.ifPresent(item::setCategoria);
+        }
+        if (this.nome != null) {
+            item.setNome(this.nome);
+        }
+        if (this.descricaoItem != null) {
+            item.setDescricao(this.descricaoItem);
+        }
+        if (this.situacao != null) {
+            item.setSituacao(this.situacao);
+        }
+
+        return item;
+    }
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/forms/CategoriaForm.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/forms/CategoriaForm.java
new file mode 100644
index 0000000..9b914fc
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/forms/CategoriaForm.java
@@ -0,0 +1,18 @@
+package br.com.accurate.achadoperdido.controllers.forms;
+
+import br.com.accurate.achadoperdido.modelo.Categoria;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class CategoriaForm {
+    @NotEmpty
+    @NotNull
+    private String nome;
+
+    public Categoria converter() {
+        return new Categoria(this.nome);
+    }
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/forms/ItemForm.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/forms/ItemForm.java
new file mode 100644
index 0000000..a95277d
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/controllers/forms/ItemForm.java
@@ -0,0 +1,66 @@
+package br.com.accurate.achadoperdido.controllers.forms;
+
+import br.com.accurate.achadoperdido.modelo.Categoria;
+import br.com.accurate.achadoperdido.modelo.Item;
+import br.com.accurate.achadoperdido.modelo.Local;
+import br.com.accurate.achadoperdido.modelo.Situacao;
+import br.com.accurate.achadoperdido.repository.CategoriaRepository;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Optional;
+
+@Data
+public class ItemForm {
+    @NotEmpty
+    @NotNull
+    private String nome;
+    @NotEmpty
+    @NotNull
+    private String descricaoItem;
+    private String descricaoLugar;
+
+    @NotNull
+    private Double latitude;
+
+    @NotNull
+    private Double longitude;
+
+    @NotNull
+    private Long categoria;
+    private Situacao situacao;
+
+    @Override
+    public String toString() {
+        return "ItemForm{" +
+                "nome='" + nome + '\'' +
+                ", descricaoItem='" + descricaoItem + '\'' +
+                ", descricaoLugar='" + descricaoLugar + '\'' +
+                ", latitude='" + latitude + '\'' +
+                ", longitude='" + longitude + '\'' +
+                '}';
+    }
+
+    public Item converter(CategoriaRepository catRepo) {
+        Item item = new Item();
+
+        Local local = new Local();
+        local.setDescricao(this.descricaoLugar);
+        local.setLatitude(this.latitude);
+        local.setLongitude(this.longitude);
+        item.setLocal(local);
+
+
+        Optional<Categoria> categoria = catRepo.findById(this.categoria);
+        categoria.ifPresent(item::setCategoria);
+
+        item.setNome(this.nome);
+        item.setDescricao(this.descricaoItem);
+        item.setSituacao(this.situacao);
+        
+        return item;
+    }
+
+
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/exceptions/ItemNaoLocalizadoException.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/exceptions/ItemNaoLocalizadoException.java
new file mode 100644
index 0000000..11d4fab
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/exceptions/ItemNaoLocalizadoException.java
@@ -0,0 +1,7 @@
+package br.com.accurate.achadoperdido.exceptions;
+
+public class ItemNaoLocalizadoException extends RecursoNaoEncontradoException {
+    public ItemNaoLocalizadoException(String nome) {
+        super("Não foi possível Localizar: " + nome);
+    }
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/exceptions/RecursoNaoEncontradoException.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/exceptions/RecursoNaoEncontradoException.java
new file mode 100644
index 0000000..eec1def
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/exceptions/RecursoNaoEncontradoException.java
@@ -0,0 +1,8 @@
+package br.com.accurate.achadoperdido.exceptions;
+
+public class RecursoNaoEncontradoException extends RuntimeException {
+    
+    public RecursoNaoEncontradoException(String mensagem) {
+        super(mensagem);
+    }
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/helpers/CalculaDistancia.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/helpers/CalculaDistancia.java
new file mode 100644
index 0000000..56e0d0b
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/helpers/CalculaDistancia.java
@@ -0,0 +1,31 @@
+package br.com.accurate.achadoperdido.helpers;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import static java.lang.Math.*;
+
+@NoArgsConstructor
+@Getter
+public class CalculaDistancia {
+    private final Long KM_RAIO_TERRA = 6371L;
+    public Double distancia;
+
+    public CalculaDistancia(Double lat1, Double long1, Double lat2, Double long2) {
+        this.distancia = this.calcular(lat1, long1, lat2, long2);
+    }
+
+    public Double calcular(Double lat1, Double long1, Double lat2, Double long2) {
+        double firstLatToRad = toRadians(lat1);
+        double secondLatToRad = toRadians(lat2);
+        double deltaLongitudeInRad = toRadians(long2 - long1);
+
+        return acos(
+                cos(firstLatToRad) * cos(secondLatToRad)
+                        * cos(deltaLongitudeInRad) + sin(firstLatToRad)
+                        * sin(secondLatToRad)
+        )
+                * KM_RAIO_TERRA;
+
+    }
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/modelo/Categoria.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/modelo/Categoria.java
new file mode 100644
index 0000000..846ead5
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/modelo/Categoria.java
@@ -0,0 +1,21 @@
+package br.com.accurate.achadoperdido.modelo;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "categorias", schema = "achados")
+@Getter
+@NoArgsConstructor
+public class Categoria {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String nome;
+
+    public Categoria(String nome) {
+        this.nome = nome;
+    }
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/modelo/Item.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/modelo/Item.java
new file mode 100644
index 0000000..231e4c8
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/modelo/Item.java
@@ -0,0 +1,50 @@
+package br.com.accurate.achadoperdido.modelo;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "itens", schema = "achados")
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class Item {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String nome;
+    private String descricao;
+    @ManyToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "local_id")
+    private Local local;
+    @Enumerated(EnumType.STRING)
+    private Situacao situacao;
+    @ManyToOne
+    @JoinColumn(name = "categoria_id")
+    private Categoria categoria;
+
+    public Categoria getCategoria() {
+        return categoria;
+    }
+
+    public Local getLocal() {
+        return local;
+    }
+
+    @Override
+    public String toString() {
+        return "Item{" +
+                "id=" + id +
+                ", nome='" + nome + '\'' +
+                ", descricao='" + descricao + '\'' +
+                ", local=" + local +
+                ", situacao=" + situacao +
+                ", categoria=" + categoria +
+                '}';
+    }
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/modelo/Local.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/modelo/Local.java
new file mode 100644
index 0000000..ac67a9c
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/modelo/Local.java
@@ -0,0 +1,23 @@
+package br.com.accurate.achadoperdido.modelo;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "locais", schema = "achados")
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class Local {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private Double latitude;
+    private Double longitude;
+    private String descricao;
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/modelo/Situacao.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/modelo/Situacao.java
new file mode 100644
index 0000000..4dd920c
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/modelo/Situacao.java
@@ -0,0 +1,5 @@
+package br.com.accurate.achadoperdido.modelo;
+
+public enum Situacao {
+    ACHADO, PERDIDO, DEVOLVIDO
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/repository/CategoriaRepository.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/repository/CategoriaRepository.java
new file mode 100644
index 0000000..80657b2
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/repository/CategoriaRepository.java
@@ -0,0 +1,9 @@
+package br.com.accurate.achadoperdido.repository;
+
+import br.com.accurate.achadoperdido.modelo.Categoria;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CategoriaRepository extends JpaRepository<Categoria, Long> {
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/repository/ItemRepository.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/repository/ItemRepository.java
new file mode 100644
index 0000000..d052c23
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/repository/ItemRepository.java
@@ -0,0 +1,22 @@
+package br.com.accurate.achadoperdido.repository;
+
+
+import br.com.accurate.achadoperdido.modelo.Item;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface ItemRepository extends JpaRepository<Item, Long> {
+    static final String HAVERSINE_PART = "(6371 * acos(cos(radians(:latitude)) * cos(radians(i.local.latitude)) * cos(radians(i.local.longitude) - radians(:longitude)) + sin(radians(:latitude)) * sin(radians(i.local.latitude))))";
+
+    public Page<Item> findByCategoriaId(Long categoria, Pageable paginacao);
+
+    @Query("SELECT i FROM Item i WHERE i.categoria.id = :categoria AND " + HAVERSINE_PART + "<= :raio")
+    public Page<Item> buscarPorCategoriaLocalizacaoERaio(@Param("categoria") Long categoria, @Param("raio") Double raio, @Param("latitude") Double latitude, @Param("longitude") Double longitude, Pageable pageable);
+
+
+}
+
+
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/services/CategoriaService.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/services/CategoriaService.java
new file mode 100644
index 0000000..eed89ce
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/services/CategoriaService.java
@@ -0,0 +1,37 @@
+package br.com.accurate.achadoperdido.services;
+
+import br.com.accurate.achadoperdido.modelo.Categoria;
+import br.com.accurate.achadoperdido.repository.CategoriaRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class CategoriaService {
+
+    @Autowired
+    private CategoriaRepository repository;
+
+    @Transactional
+    public Categoria cadastrar(Categoria categoria) {
+        return this.repository.save(categoria);
+    }
+
+    public List<Categoria> listarTodas() {
+        return this.repository.findAll();
+    }
+
+    @Transactional
+    public Categoria atualizar(Categoria categoria) {
+        Objects.requireNonNull(categoria.getId());
+        return this.repository.save(categoria);
+    }
+
+    @Transactional
+    public void apagar(Categoria categoria) {
+        this.repository.delete(categoria);
+    }
+}
diff --git a/achado-perdido/src/main/java/br/com/accurate/achadoperdido/services/ItemService.java b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/services/ItemService.java
new file mode 100644
index 0000000..8c4abff
--- /dev/null
+++ b/achado-perdido/src/main/java/br/com/accurate/achadoperdido/services/ItemService.java
@@ -0,0 +1,71 @@
+package br.com.accurate.achadoperdido.services;
+
+import br.com.accurate.achadoperdido.exceptions.ItemNaoLocalizadoException;
+import br.com.accurate.achadoperdido.helpers.CalculaDistancia;
+import br.com.accurate.achadoperdido.modelo.Item;
+import br.com.accurate.achadoperdido.repository.ItemRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.Optional;
+
+@Service
+public class ItemService {
+
+    @Autowired
+    public ItemRepository repository;
+
+
+    public Page<Item> listarPorCategoria(Long categoria_id, Pageable paginacao) {
+        return this.repository.findByCategoriaId(categoria_id, paginacao);
+    }
+
+    public Page<Item> listarTodos(Pageable pageable) {
+        return this.repository.findAll(pageable);
+    }
+
+    @Transactional
+    public Item cadastrar(Item item) {
+        return this.repository.save(item);
+    }
+
+
+    public Item buscarPorId(Long id) {
+        Optional<Item> item = this.repository.findById(id);
+
+        if (item.isEmpty()) {
+            throw new ItemNaoLocalizadoException("Item id: " + id);
+        }
+
+        return item.get();
+    }
+
+    @Transactional
+    public void atualizar(Long id, Item item) {
+        item.setId(id);
+
+        this.repository.save(item);
+    }
+
+    @Transactional
+    public void apagar(Long id) {
+        Item item = this.buscarPorId(id);
+        this.repository.delete(item);
+    }
+
+    public Page<Item> obterItemPorLocalidadeCategoriaERaio(Long categoria,
+                                                           Double raio,
+                                                           Double latitude,
+                                                           Double longitude,
+                                                           Pageable paginacao) {
+
+        CalculaDistancia calculaDistancia = new CalculaDistancia();
+
+        Page<Item> itens = this.repository.buscarPorCategoriaLocalizacaoERaio(categoria, raio, latitude, longitude, paginacao);
+
+        return itens;
+    }
+}
diff --git a/achado-perdido/src/main/resources/application.properties b/achado-perdido/src/main/resources/application.properties
new file mode 100644
index 0000000..dd8b3e8
--- /dev/null
+++ b/achado-perdido/src/main/resources/application.properties
@@ -0,0 +1,7 @@
+spring.datasource.url=jdbc:postgresql://localhost:5432/achadosperdidos
+spring.datasource.username=walker
+spring.datasource.password=
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.jpa.hibernate.ddl-auto=update
+spring.devtools.livereload.enabled=true
+
diff --git a/achado-perdido/src/test/java/br/com/accurate/achadoperdido/AchadoPerdidoApplicationTests.java b/achado-perdido/src/test/java/br/com/accurate/achadoperdido/AchadoPerdidoApplicationTests.java
new file mode 100644
index 0000000..f98e86a
--- /dev/null
+++ b/achado-perdido/src/test/java/br/com/accurate/achadoperdido/AchadoPerdidoApplicationTests.java
@@ -0,0 +1,13 @@
+package br.com.accurate.achadoperdido;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class AchadoPerdidoApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}