Slightly reorganized source files' structure