one step closer to the right structure
two new files