Fixed Source and Updated it to a Maven Project