Refactor according to the best practice (specs in the same folder as src)