Moved all to a maven project