Restructuring, writing test and starting to solve 001