Add janicep support and change structure