Reworked dir layout and added test