Organizing sources, adding some particle code