Again restructure beams module. Optimize spacecharge module a little and prepare for testing.