Converted to standard Maven setup