Rework dir structure, and cleanup parser