diff --git a/.gitignore b/.gitignore
index f28849c..3686705 100644
--- a/.gitignore
+++ b/.gitignore
@@ -253,18 +253,26 @@ PhotoAlbum/wwwroot/uploads/*
 *.log
 
 # Maven
-target/
-
-# Package files (except lib directory dependencies)
+**/target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+
+# Package files
 *.war
 *.ear
 *.zip
 *.tar.gz
 *.rar
 
-# JAR files (but keep lib/ directory JARs for Ant project)
+# JAR files (Maven will manage dependencies)
 *.jar
-!lib/*.jar
 
 # IDE
 .idea/
diff --git a/README.md b/README.md
index b10a897..c6a4663 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@ A simple photo gallery web application built with pure Servlet/JSP and H2 in-mem
 
 ## Prerequisites
 
-- Java 8+
-- Apache Ant 1.9+
+- Java 11+
+- Apache Maven 3.6+
 - Application Server: Tomcat 8.5+ / GlassFish 7 / WebSphere Liberty 25.x
 
 ## Quick Start
@@ -13,28 +13,28 @@ A simple photo gallery web application built with pure Servlet/JSP and H2 in-mem
 ### 1. Build
 
 ```bash
-ant war
+mvn clean package
 ```
 
 ### 2. Deploy (choose one)
 
 **GlassFish:**
 ```bash
-cp dist/photo-album.war $GLASSFISH_HOME/glassfish/domains/domain1/autodeploy/
+cp target/photo-album.war $GLASSFISH_HOME/glassfish/domains/domain1/autodeploy/
 $GLASSFISH_HOME/bin/asadmin start-domain
 # Access: http://localhost:8080/photo-album/
 ```
 
 **WebSphere Liberty:**
 ```bash
-cp dist/photo-album.war $WLP_HOME/usr/servers/defaultServer/dropins/
+cp target/photo-album.war $WLP_HOME/usr/servers/defaultServer/dropins/
 $WLP_HOME/bin/server run defaultServer
 # Access: http://localhost:9080/photo-album/
 ```
 
 **Tomcat:**
 ```bash
-cp dist/photo-album.war $CATALINA_HOME/webapps/
+cp target/photo-album.war $CATALINA_HOME/webapps/
 $CATALINA_HOME/bin/catalina.sh run
 # Access: http://localhost:8080/photo-album/
 ```
@@ -61,4 +61,4 @@ $CATALINA_HOME/bin/catalina.sh stop
 - Jakarta Servlet 6.0 / JSP 3.1 / JSTL 3.0
 - Pure JDBC (no ORM)
 - H2 2.2.224 in-memory database (auto-initialized)
-- Apache Ant 1.9+ build
+- Apache Maven 3.6+ build
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 7829101..0000000
--- a/build.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="photo-album" default="war" basedir=".">
-    <!-- ========================================== -->
-    <!-- Properties                                  -->
-    <!-- ========================================== -->
-    <property name="src.dir" value="src"/>
-    <property name="resources.dir" value="resources"/>
-    <property name="webapp.dir" value="webapp"/>
-    <property name="lib.dir" value="lib"/>
-    <property name="build.dir" value="build"/>
-    <property name="classes.dir" value="${build.dir}/classes"/>
-    <property name="dist.dir" value="dist"/>
-    <property name="war.name" value="photo-album.war"/>
-
-    <!-- Java compilation properties -->
-    <property name="java.source" value="1.8"/>
-    <property name="java.target" value="1.8"/>
-    <property name="encoding" value="UTF-8"/>
-
-    <!-- ========================================== -->
-    <!-- Classpath                                  -->
-    <!-- ========================================== -->
-    <path id="compile.classpath">
-        <fileset dir="${lib.dir}">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
-
-    <!-- ========================================== -->
-    <!-- Targets                                    -->
-    <!-- ========================================== -->
-
-    <!-- Clean target: removes build and dist directories -->
-    <target name="clean" description="Clean build and dist directories">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}"/>
-        <echo message="Cleaned build and dist directories"/>
-    </target>
-
-    <!-- Init target: creates necessary directories -->
-    <target name="init" description="Initialize build directories">
-        <mkdir dir="${build.dir}"/>
-        <mkdir dir="${classes.dir}"/>
-        <mkdir dir="${dist.dir}"/>
-        <echo message="Created build directories"/>
-    </target>
-
-    <!-- Compile target: compiles Java source files -->
-    <target name="compile" depends="init" description="Compile Java sources">
-        <javac srcdir="${src.dir}"
-               destdir="${classes.dir}"
-               source="${java.source}"
-               target="${java.target}"
-               encoding="${encoding}"
-               includeantruntime="false"
-               debug="true">
-            <classpath refid="compile.classpath"/>
-        </javac>
-
-        <!-- Copy resources to classes directory -->
-        <copy todir="${classes.dir}">
-            <fileset dir="${resources.dir}">
-                <include name="**/*.properties"/>
-                <include name="**/*.xml"/>
-            </fileset>
-        </copy>
-
-        <echo message="Compiled Java sources"/>
-    </target>
-
-    <!-- WAR target: creates web application archive -->
-    <target name="war" depends="compile" description="Build WAR file">
-        <war destfile="${dist.dir}/${war.name}" webxml="${webapp.dir}/WEB-INF/web.xml">
-            <!-- Add compiled classes -->
-            <classes dir="${classes.dir}"/>
-
-            <!-- Add web content (JSP, HTML, CSS, JS) -->
-            <fileset dir="${webapp.dir}">
-                <exclude name="WEB-INF/web.xml"/>
-            </fileset>
-
-            <!-- Add library JARs -->
-            <lib dir="${lib.dir}">
-                <include name="**/*.jar"/>
-                <!-- Exclude APIs provided by container -->
-                <exclude name="servlet-api*.jar"/>
-                <exclude name="jsp-api*.jar"/>
-                <exclude name="jstl*.jar"/>
-                <exclude name="javax.servlet.jsp.jstl*.jar"/>
-            </lib>
-        </war>
-
-        <echo message="Created WAR file: ${dist.dir}/${war.name}"/>
-    </target>
-
-    <!-- Build all target -->
-    <target name="build" depends="clean,war" description="Clean and build WAR file">
-        <echo message="Build completed successfully"/>
-    </target>
-
-    <!-- Deploy target: copies WAR to Tomcat webapps directory -->
-    <target name="deploy" depends="war" description="Deploy WAR to Tomcat">
-        <property name="tomcat.home" value="${env.CATALINA_HOME}"/>
-        <fail message="CATALINA_HOME environment variable not set" unless="tomcat.home"/>
-
-        <copy file="${dist.dir}/${war.name}"
-              todir="${tomcat.home}/webapps"
-              overwrite="true"/>
-
-        <echo message="Deployed ${war.name} to ${tomcat.home}/webapps"/>
-    </target>
-
-    <!-- Run target: compiles and displays usage instructions -->
-    <target name="run" depends="war" description="Display run instructions">
-        <echo message="==================================="/>
-        <echo message="WAR file built: ${dist.dir}/${war.name}"/>
-        <echo message=""/>
-        <echo message="To deploy and run:"/>
-        <echo message="1. Copy ${dist.dir}/${war.name} to your Tomcat webapps/ directory"/>
-        <echo message="2. Start Tomcat: catalina.sh run (or startup.sh)"/>
-        <echo message="3. Access: http://localhost:8080/photo-album/"/>
-        <echo message=""/>
-        <echo message="Or run: ant deploy (if CATALINA_HOME is set)"/>
-        <echo message="==================================="/>
-    </target>
-
-    <!-- Help target -->
-    <target name="help" description="Display available targets">
-        <echo message="Available targets:"/>
-        <echo message="  clean   - Remove build and dist directories"/>
-        <echo message="  compile - Compile Java sources"/>
-        <echo message="  war     - Build WAR file (default)"/>
-        <echo message="  build   - Clean and build WAR file"/>
-        <echo message="  deploy  - Deploy WAR to Tomcat (requires CATALINA_HOME)"/>
-        <echo message="  run     - Display run instructions"/>
-        <echo message="  help    - Display this help message"/>
-    </target>
-</project>
diff --git a/jar-files.md b/jar-files.md
new file mode 100644
index 0000000..73b3311
--- /dev/null
+++ b/jar-files.md
@@ -0,0 +1,34 @@
+# JAR Files Analysis
+
+This document tracks the analysis of all JAR files in the project and their availability in Maven Central Repository.
+
+## JAR Files Status
+
+- [x] **commons-fileupload-1.5.jar** - Exists in Maven central repository
+  - GroupId: commons-fileupload
+  - ArtifactId: commons-fileupload
+  - Version: 1.5
+  - Added to pom.xml
+
+- [x] **commons-io-2.11.0.jar** - Exists in Maven central repository
+  - GroupId: commons-io
+  - ArtifactId: commons-io
+  - Version: 2.11.0
+  - Added to pom.xml
+
+- [x] **h2-2.2.224.jar** - Exists in Maven central repository
+  - GroupId: com.h2database
+  - ArtifactId: h2
+  - Version: 2.2.224
+  - Added to pom.xml
+
+- [x] **jakarta.servlet-api-6.0.0.jar** - Exists in Maven central repository
+  - GroupId: jakarta.servlet
+  - ArtifactId: jakarta.servlet-api
+  - Version: 6.0.0
+  - Scope: provided (provided by servlet container)
+  - Added to pom.xml
+
+## Summary
+
+All 4 JAR files are available in Maven Central Repository and have been added to pom.xml as Maven dependencies. No system-scoped dependencies are required.
diff --git a/lib/commons-fileupload-1.5.jar b/lib/commons-fileupload-1.5.jar
deleted file mode 100644
index 5e60875..0000000
Binary files a/lib/commons-fileupload-1.5.jar and /dev/null differ
diff --git a/lib/commons-io-2.11.0.jar b/lib/commons-io-2.11.0.jar
deleted file mode 100644
index be507d9..0000000
Binary files a/lib/commons-io-2.11.0.jar and /dev/null differ
diff --git a/lib/h2-2.2.224.jar b/lib/h2-2.2.224.jar
deleted file mode 100644
index ff1997a..0000000
Binary files a/lib/h2-2.2.224.jar and /dev/null differ
diff --git a/lib/jakarta.servlet-api-6.0.0.jar b/lib/jakarta.servlet-api-6.0.0.jar
deleted file mode 100644
index d15c10c..0000000
Binary files a/lib/jakarta.servlet-api-6.0.0.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..126205e
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
+         http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.photoalbum</groupId>
+    <artifactId>photo-album</artifactId>
+    <version>1.0.0</version>
+    <packaging>war</packaging>
+
+    <name>Photo Album Application</name>
+    <description>A simple photo gallery application using Servlet/JSP</description>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <!-- Jakarta Servlet API (provided by container) -->
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Apache Commons FileUpload -->
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.5</version>
+        </dependency>
+
+        <!-- Apache Commons IO -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+        </dependency>
+
+        <!-- H2 Database -->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>2.2.224</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>photo-album</finalName>
+        <plugins>
+            <!-- Maven Compiler Plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+
+            <!-- Maven WAR Plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.4.0</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/com/photoalbum/dao/PhotoDAO.java b/src/main/java/com/photoalbum/dao/PhotoDAO.java
similarity index 100%
rename from src/com/photoalbum/dao/PhotoDAO.java
rename to src/main/java/com/photoalbum/dao/PhotoDAO.java
diff --git a/src/com/photoalbum/model/Photo.java b/src/main/java/com/photoalbum/model/Photo.java
similarity index 100%
rename from src/com/photoalbum/model/Photo.java
rename to src/main/java/com/photoalbum/model/Photo.java
diff --git a/src/com/photoalbum/model/UploadResult.java b/src/main/java/com/photoalbum/model/UploadResult.java
similarity index 100%
rename from src/com/photoalbum/model/UploadResult.java
rename to src/main/java/com/photoalbum/model/UploadResult.java
diff --git a/src/com/photoalbum/servlet/DetailServlet.java b/src/main/java/com/photoalbum/servlet/DetailServlet.java
similarity index 100%
rename from src/com/photoalbum/servlet/DetailServlet.java
rename to src/main/java/com/photoalbum/servlet/DetailServlet.java
diff --git a/src/com/photoalbum/servlet/DownloadServlet.java b/src/main/java/com/photoalbum/servlet/DownloadServlet.java
similarity index 100%
rename from src/com/photoalbum/servlet/DownloadServlet.java
rename to src/main/java/com/photoalbum/servlet/DownloadServlet.java
diff --git a/src/com/photoalbum/servlet/HomeServlet.java b/src/main/java/com/photoalbum/servlet/HomeServlet.java
similarity index 100%
rename from src/com/photoalbum/servlet/HomeServlet.java
rename to src/main/java/com/photoalbum/servlet/HomeServlet.java
diff --git a/src/com/photoalbum/servlet/UploadServlet.java b/src/main/java/com/photoalbum/servlet/UploadServlet.java
similarity index 100%
rename from src/com/photoalbum/servlet/UploadServlet.java
rename to src/main/java/com/photoalbum/servlet/UploadServlet.java
diff --git a/src/com/photoalbum/util/DatabaseConfig.java b/src/main/java/com/photoalbum/util/DatabaseConfig.java
similarity index 100%
rename from src/com/photoalbum/util/DatabaseConfig.java
rename to src/main/java/com/photoalbum/util/DatabaseConfig.java
diff --git a/resources/application.properties b/src/main/resources/application.properties
similarity index 100%
rename from resources/application.properties
rename to src/main/resources/application.properties
diff --git a/webapp/WEB-INF/jsp/detail.jsp b/src/main/webapp/WEB-INF/jsp/detail.jsp
similarity index 100%
rename from webapp/WEB-INF/jsp/detail.jsp
rename to src/main/webapp/WEB-INF/jsp/detail.jsp
diff --git a/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp
similarity index 100%
rename from webapp/WEB-INF/jsp/index.jsp
rename to src/main/webapp/WEB-INF/jsp/index.jsp
diff --git a/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapp/WEB-INF/web.xml
rename to src/main/webapp/WEB-INF/web.xml
diff --git a/webapp/css/site.css b/src/main/webapp/css/site.css
similarity index 100%
rename from webapp/css/site.css
rename to src/main/webapp/css/site.css
diff --git a/webapp/index.html b/src/main/webapp/index.html
similarity index 100%
rename from webapp/index.html
rename to src/main/webapp/index.html
diff --git a/webapp/js/upload.js b/src/main/webapp/js/upload.js
similarity index 100%
rename from webapp/js/upload.js
rename to src/main/webapp/js/upload.js