Some restructuring
Quick start test