Converted project to proper Maven structure