Re-Write without Maven