Better organization (again)

One day I’ll figure out how I want to put everything…