Restructured into package, may have caused some bugs due to hardcoded locations
Created maven project