maven re-structured. Ok, tested