Restructure packaging as per Maven standards